bootstrap grid, sidebar, nav, 2 wells, color scheme
Merge branch 'master' of https://github.com/hkassier8/iX-final_project

Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/application.html.erb