GEOLOCATION ERROR
Merge branch 'master' of https://github.com/servemoore/pairs

Conflicts:
	app/assets/stylesheets/needs.css.scss
	app/assets/stylesheets/needs.scss
	app/assets/stylesheets/work_orders.css.scss