Edited the UML to reflect discussed changes.
Added more to the UML
More MVC UML updates
Altered source code to more closely match new UML
trying elasticsearchstuff
you might need jar file
Fixed some small bugs
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
I'm ahead by two commits.
edited uml
edited uml
edited uml
clearing up before I go to my branch
still need to clear stuff up
switching to personal branch
updated file structure
removed failed ES attempts
worked on sorting
added sort tests
working on merge
merged with twendlan