Changs color to navbar
Merge branch 'master' of https://github.com/sbercus10/Bootcamp_Bucks

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.scss
Merge branch 'master' of https://github.com/sbercus10/Bootcamp_Bucks

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.scss
Makes changes from Adam: service model, costform, and realcostscalculator

Merge branch 'master' of https://github.com/sbercus10/Bootcamp_Bucks
Adds bootcamp seeds, changes nav bar, and cost_form
Adds bootcamp seeds, changes nav bar, and cost_form.
Merge branch 'master' of https://github.com/sbercus10/Bootcamp_Bucks