level 6 finished!
Merge branch 'master' of https://github.com/tie372/phaseJam

Conflicts:
	main.lua