Fixed up part of the GeoLocationTest files. Not completed yet
Merge branch 'master' of https://github.com/CMPUT301W14T08/GeoChan

Conflicts:
	GeoChan/src/ca/ualberta/cmput301w14t08/geochan/models/GeoLocation.java
	GeoChanTests/src/ca/ualberta/cmput301w14t08/geochan/test/GeoLocationTest.java
Merge branch 'master' of https://github.com/CMPUT301W14T08/GeoChan
Merge branch 'master' of https://github.com/CMPUT301W14T08/GeoChan
Finished the GeoLocationTest file, started working on the LocationListenerService testing