merged
Merge branch 'master' into matt

Conflicts:
	GeoTopicsTests/src/ca/ualberta/cs/team5geotopics/test/F_CacheTests.java
added test for use case 10
Merge branch 'master' into matt
Merge branch 'master' into matt
added test for usecase 10