make heroku happy
update Gemfile.lock
Merge branch 'master' of https://github.com/pzatrick/beer
Upgrade to rails 4 and use HAML