commit prior to pull
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
merge demons: "I want to pull master. Give me master."
renamed service. switching back to branch.
forgot new named file.
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
merge