modified:   Heritage Mapper/res/layout/activity_visited_list.xml
	modified:   Heritage Mapper/src/ca/jchoi/HerritageMapper/WishlistActivity.java
Merge remote-tracking branch 'upstream/master'