Merge branch 'master' of github.com:ethereum/cpp-ethereum

CodingStandards.txt

@@ -46,7 +46,7 @@ a. File comment is always at top, and includes:
 - Original author, date.
 - Later maintainers (not contributors - they can be seen through VCS log).
 - Copyright.
-- Licence (e.g. see COPYING).
+- License (e.g. see COPYING).
 b. Never use #ifdef/#define/#endif file guards. Prefer #pragma once as first line below file comment.
 c. Prefer static const variable to value macros.
 d. Prefer inline constexpr functions to function macros.

README.md

@@ -12,12 +12,10 @@ See BUILDING.md
 
 See TODO
 
-## Licence
+## License
 
-See LICENCE
+See LICENSE
 
 ## Contributing
 
 Please read CodingStandards.txt thoroughly before making alterations to the code base. Please do *NOT* use an editor that automatically reformats whitespace away from astylerc or the formating guidelines as describled in CodingStandards.txt.
-
-