Removed our location class due to upstream merge
Removed our location class due to upstream merge
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga
Fixed Pixmap import.
Fixed merge conflict in the map from upstream. Added back the correct reachedGoal method
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga
Fixed upstream merge problems in the level editor code. Changed test map to ensure this worked
Merge branch 'jerryandjack' of https://github.com/duke-compsci308-spring2013/vooga into jerryandjack
change pictures