More demo stuff.
Merge branch 'master' of github.com:cegekanocturne/godgame

Conflicts:
	src/main/java/com/cegeka/nocturne/godgame/time/Timer.java