initial Test
initial Test
Merge remote-tracking branch 'origin/Improvements' into unitTest
fix gitignore
Menu
Menu
Nothing
Merge remote-tracking branch 'origin/mapBranch' into SmoothMovement

Conflicts:
	assets/AutopackingTiles/Door/PackedDoor.atlas
get rid atlas
atlas
Merge branch 'SmoothMovement' into unitTest

Conflicts:
	assets/AutopackingTiles/Door/PackedDoor.atlas
fix gitignore
map updates
changes
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