edited uml just to remove some of the overlapping lines for clarity
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics

Conflicts:
	docs/UML/Team5GeoTopics-Controller-View-UML.jpg
	docs/UML/Team5GeoTopicsController-ViewUML.class.violet.html