now works on java 1.6
.gitignore for *.atlas
Merge branch 'master' of https://github.com/Lduperron/CSCI375-Team-Project

Conflicts:
	.gitignore
	assets/AutopackingTiles/Door/PackedDoor.atlas