commit
cache now builds seperate files in history subdirectory for each es query
fixed freshness sort
added a load method to cache
Merge branch 'twendlan'
freshness sort algorithm updated / fixed tests
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
cache now accesses json strings properly
Updated UML, Removed Scoring System Sort
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics

Conflicts:
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/BrowseActivity.java
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/CommentListModel.java
Fixed up merge mess. Nothing new.
updated error code
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics
merge demons my god
Add source code intro comment as per requirements
Added some more header descriptions
cache changes
Merge branch 'master' of https://github.com/CMPUT301W14T05/Team5GeoTopics

Conflicts:
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/CommentSearch.java
preparing merge
Merge branch 'matt'

Conflicts:
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/Cache.java
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/CommentSearch.java
	GeoTopicsActivity/src/ca/ualberta/cs/team5geotopics/StartActivity.java
only null pointer exception stands in my way