Actually fix the merge errors
Merge branch 'master' of https://github.com/jamestlynch/CSCI201_Team_FinalProject
Add the source for JMapViewer to map package and add a few lines to show you can change the colors on a circle added to the map