update application.rb
Add rspec-rails to the project
update Gemfile.lock
update bootstrap
Merge branch 'master' of https://github.com/schikada/hackathon

Conflicts:
	heroku/hackathon/config/application.rb