modified:   Heritage Mapper/AndroidManifest.xml
	modified:   Heritage Mapper/res/layout/activity_search.xml
	modified:   Heritage Mapper/src/ca/jchoi/HerritageMapper/MainActivity.java
	modified:   Heritage Mapper/src/ca/jchoi/HerritageMapper/SearchActivity.java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Heritage Mapper/res/layout/activity_search.xml
	Heritage Mapper/src/ca/jchoi/HerritageMapper/SearchActivity.java

	modified:   Heritage Mapper/res/layout/activity_search.xml
	modified:   Heritage Mapper/res/layout/activity_wishlist.xml
	modified:   Heritage Mapper/res/values/strings.xml
	modified:   Heritage Mapper/src/ca/jchoi/HerritageMapper/LocationInfoActivity.java
	modified:   Heritage Mapper/src/ca/jchoi/HerritageMapper/SearchActivity.java
	modified:   Heritage Mapper/src/ca/jchoi/HerritageMapper/WishlistActivity.java
Conflict fix

remove changes