getting latest
Merge branch 'master' of github.com:jusroberts-cb/job_map

Conflicts:
	app/assets/stylesheets/bootstrap.css
Changed styling for search form.