...
...
Merge branch 'master' of https://github.com/lapl4rt/Cow-Std-String

Conflicts:
	String/StdString.cpp
	String/StdString.h
	String/String.h