First Test Commit
Merge https://github.com/Cfeusier/map-app
This is a test merge because of an Xcode5 error
Test Commit