Update .classpath
Fix gitignore
fix gitignore
Atlas
changes
Merge branch 'master' of https://github.com/Lduperron/CSCI375-Team-Project into mapBranch

Conflicts:
	assets/AutopackingTiles/Door/PackedDoor.atlas
atlas....
Merge branch 'mapBranch' of https://github.com/Lduperron/CSCI375-Team-Project into mapBranch
get rid of java error
Atlas
Atlas
Merge pull request #4 from Lduperron/Improvements

Improvements
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
map
wall.png
scrub classpath
Merge pull request #5 from Lduperron/mapBranch

Map branch
Merge pull request #6 from Lduperron/master

Merge with master