merging
Merge branch 'master' of https://github.com/TerranceN/ATA_Coop_Hackathon

Conflicts:
	client/js/app.js
Merge branch 'master' of https://github.com/TerranceN/ATA_Coop_Hackathon
fixed collision for new tiles