merging problems
Merge branch 'master' of https://github.com/Mrbilec/CMPUT301W14T09-GPSForm

Conflicts:
	CMPUT301W14T09/src/ca/cmput301w14t09/TopCommentsActivity.java