Sloppy commit
Merge branch 'sloppy_branch'

* sloppy_branch:
  Sloppy commit

Conflicts:
	[RESOLVED] app/assets/stylesheets/geographic_locations.css.less
	[RESOLVED] app/views/geographic_locations/index.html.haml