error checking on map
Merge branch 'master' of https://github.com/emoore24/connecttour
Merge branch 'master' of https://github.com/emoore24/connecttour
should be done