Committing small changes
Merge branch 'master' of github.com:decwong/Cocooned

Conflicts:
	Cocooned/level1.lua