basic collisions
fix owen bugs
Merge branch 'master' of https://github.com/TerranceN/ATA_Coop_Hackathon

Conflicts:
	common/world.js