Update to bootstrap
Merge branch 'master' of github.com:ColoradoSchoolOfMines/schedule_miner

Conflicts:
	app/assets/stylesheets/foundation_and_overrides.scss
	app/views/layouts/application.html.erb
Remove Foundation after merge, fixed merge