Added some user tests
minor cache change
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
cache test is not funcional
Merge remote-tracking branch 'origin/bryce'
Generated Javadoc for the project
writing cache tests is proving very difficult
Updated Javadoc and comment formatting
Added comments to methods.
Added Javadoc comments
Updated Javadoc.
Updated UML.
Moved the Javadoc to the doc folder
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics

Conflicts:
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/Cache.java
Merge branch 'master' into matt

Conflicts:
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/Cache.java
created test for cache IO
removed the now uneeded graph builder. The cache test now functions
Small UML update
removed some parrot documentation
edited tests for Use Case 4