display points on the map
Merge branch 'master' of github.com:leonchen/altitudeSearching

Conflicts:
	public/javascripts/app.js