swapped in bootstrap
Merge branch 'master' of github.com:sherigr/sports_gif into user

Conflicts:
	sports_gif_app/app/controllers/users_controller.rb
User session memory
Merge pull request #9 from sherigr/user

swapped in bootstrap