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

Conflicts:
	public/js/main.js