Missing files which were not commited
Merge branch 'master' of github.com:LeanderBB/CGE

Conflicts:
	CMakeLists.txt