added bootstrap
fb login works
Used Bootstrap CSS/JS for welcome page
Merged files application.html.erb, users_controller.rb, and users/index.html.erb
Modified users/index.html.erb file to fix css a bit...still needs more work
Fixed the CSS of all web pages, fixed links, and added nested resources :searches
added fb share button
more fb share button adaptations
gemfile
merge conflicts