fixed heroku compiling bug
added boostrap again cuz reasons
Merge branch 'adding-bootstrap'

Conflicts:
	config/environments/development.rb