Nom de no
Merge branch 'master' of https://github.com/rahajarison/GGJEngine

Conflicts:
	sources/framework/GGJMap.cpp
	sources/objMusic.cpp