Teaching how to use git
StartLocation markers now blue
delete the comment
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/josh/qcmapit/SearchSuggestionList.java