delete the comment
delete the comment
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/josh/qcmapit/SearchSuggestionList.java
Merge branch 'master' of https://github.com/jhorowitz/QC_Map_It
delete the comment
final connections
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/modules.xml
Merge pull request #7 from jmorana/master

master