Only test purposes
Merge branch 'master' of https://github.com/badlogic/ggj2014
Merge branch 'master' of https://github.com/badlogic/ggj2014

Conflicts:
	ggj2014/src/com/ggj2014/Game.java