modified:   Heritage Mapper/project.properties
	modified:   Heritage Mapper/res/layout/activity_location_info.xml
	modified:   Heritage Mapper/src/ca/jchoi/HerritageMapper/LocationInfoActivity.java
	modified:   Heritage Mapper/src/ca/jchoi/HerritageMapper/MainActivity.java
Merge branch 'master' of https://github.com/RoxT/HeritageMapper

Conflicts:
	Heritage Mapper/src/ca/jchoi/HerritageMapper/LocationInfoActivity.java