Merge branch 'master' of https://github.com/TheMetabug/CityDestroyer

Conflicts:
	TemplateProject/Project/include/ProtoScene.hpp
	TemplateProject/Project/source/ProtoScene.cpp