Checked Zach's commit
what?
Hello
hello again
Merge branch 'master' of https://github.com/pabbylake/LakeAppleMap

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/pabbylake/LakeAppleMap