testing out how to read in from json and lua files
Merge branch 'master' of https://github.com/DamagedPandaGame/Cocooned
testing out how to get data from json and lua files
create collision detection class and global variable class and cleaned up some code with comments
Merge branch 'master' of https://github.com/DamagedPandaGame/Cocooned
fixed merge bugs and added collision detection, along with fixing global variables issue
Conflicts:
	CocoonedTiled/gameLoop.lua
	CocoonedTiled/menu.lua