arguing with git
1
Merge branch 'newmaster' of https://github.com/vlastachu/n1bounce into newmaster

Conflicts:
	msvc12/yoba/yoba/yoba.vcxproj.filters
	src/Engine.cpp
	src/Engine.h
	src/EventManager.cpp
	src/EventManager.h
	src/Font.cpp
	src/Font.h
	src/GameCore.cpp
	src/GameCore.h
	src/Graphics.cpp
	src/Graphics.h
	src/Map.cpp
	src/Map.h
	src/Module.h
	src/ModuleManager.cpp
	src/ModuleManager.h
	src/Ninja.cpp
	src/Ninja.h
	src/defs.h
	src/main.cpp