wireframe controller
Merge pull request #1 from PLopezD/master

wireframe controller
landing page
Merge pull request #2 from PLopezD/master

landing page
add user/:id page to display user info and all their associated ratings
Update README.md
Merge pull request #1 from Seane235/master

?
Merge pull request #3 from PLopezD/master

Merge pull request #1 from Seane235/master
landing page2
removed favorites migration (iceboxed) minor changes to user model
Updating to master

Merge branch 'master' of https://github.com/Seane235/Beeriodic
updating to master
Merge branch 'pablo'
Merge pull request #4 from PLopezD/master

master
still working on users/id
update gemfile version
jquery start
Merge pull request #5 from PLopezD/master

jquery start
add sorted table of user specific ratings for beers and families
Merge remote-tracking branch 'upstream/master'