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
Merge branch 'master' of https://github.com/mendoncakr/GradePending2.0 into highcharts
adding nearby restaurants display on show page
added current grade column to restaurants table
added high-charts for breakdown of grades in NYC restaurants