trying elasticsearchstuff
you might need jar file
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
removed failed ES attempts
More matching to the new UML