Kaoz
Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Conflicts:
	Escape-the-Dawn/main.cpp
Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn