commit before merge
fixed merge conflicts
removed unneeded haml in gemfile
added back restaurants/show
merge from upstream
Merge pull request #27 from bsusensjackson/haml

Haml
Merge pull request #28 from mendoncakr/haml

sweet as