a
Merge branch 'master' of https://github.com/Arastrea/Projects

Conflicts:
	GlobalityLocality/main.cpp