commit
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
updated error code
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
merge demons my god