Added some simple items to level generation
Merge branch 'master' of https://github.com/HackSoc/LudumDare29

Conflicts:
	level.c
Merge branch 'master' of https://github.com/HackSoc/LudumDare29