modified:   Heritage Mapper/assets/NHSC_LHNC_TB.csv
	modified:   Heritage Mapper/project.properties
	modified:   Heritage Mapper/src/ca/jchoi/HerritageMapper/MainActivity.java
Merge branch 'master' of https://github.com/RoxT/HeritageMapper

Conflicts:
	Heritage Mapper/project.properties
	new file:   Heritage Mapper/res/layout/info_window_layout.xml