Fixes #4
fixes #3
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/markers.js