Merging CollisionLayer.cpp
Merging SpriteObject.cpp
Merging CollisionLayer.cpp
Merging Xcode project
Committing Xcode project
Committing A* implementation