added the customMarker test class
Merge branch 'master' of https://github.com/CMPUT301W14T08/GeoChan

Conflicts:
	GeoChan/src/ca/ualberta/cmput301w14t08/geochan/fragments/CustomLocationFragment.java
added an infoWindow test to customMarker tests
Merge branch 'master' of https://github.com/CMPUT301W14T08/GeoChan