more things
Merge branch 'master' of https://github.com/Jseph/GameJam.git

Conflicts:
	level0.dat
Merge branch 'master' of https://github.com/Jseph/GameJam.git