Updated locations on map
Merge pull request #1 from lukelee0816/master

Updated locations on map
Changes Merged, edited and applied
Changes Merged, edited and applied
Merge branch 'master' of https://github.com/jhorowitz/QC_Map_It

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
	app/app.iml
	app/src/main/java/com/example/josh/qcmapit/MapPane.java
	app/src/main/java/com/example/josh/qcmapit/SearchSuggestionList.java
Merge branch 'master' of https://github.com/jhorowitz/QC_Map_It

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
	app/app.iml
	app/src/main/java/com/example/josh/qcmapit/MapPane.java
	app/src/main/java/com/example/josh/qcmapit/SearchSuggestionList.java
Merge branch 'master' of https://github.com/jhorowitz/QC_Map_It

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
	app/app.iml
	app/src/main/java/com/example/josh/qcmapit/MapPane.java
	app/src/main/java/com/example/josh/qcmapit/SearchSuggestionList.java

updated locations