game play 2d
Merge branch 'master' of https://github.com/traissa/endls

Conflicts:
	gamePlay2D.lua
	main.lua