blah
Merge branch 'master' of github.com:oncer/gamejam13

Conflicts:
	src/Game.cpp
compile fixes