added bootstrap framework
Merge branch 'master' into bootstrap
merged master into bootstrap branch
Formatted and styled the site
changed All restaurants to All Restaurants
better tests
remove 'focus: true'
Refactored user_adds_a_comment_spec.rb
cleaned up user_adds_a_shop_spec.rb
Finished the model tests for Restaurant
added model tests to User
Merge pull request #12 from calebthill/fix_test

Fix test