added more functionality to the map
added classes for keeping track of things on the map
Merge branch 'master' of https://github.com/gavinhoward/byu-cs340-sixmix