butts is all 4 all tyme
Merge branch 'master' of https://github.com/massiveboom/mapapp

Conflicts:
	public/javascripts/map.js