commit16
commit17
Merge branch 'master' of https://github.com/morgante/landmarkr

Conflicts:
	index.html
	index.php