Merge pull request #6 from unknownbreaker/master

Rob's user/:id route and user_profile page
added profile pages for Beer and Family models, links between and rating displays unduplicated
beer emoji img file added
Merge branch 'master' of https://github.com/Seane235/Beeriodic into family_page

Merge branch 'master' of https://github.com/Seane235/Beeriodic
Merge branch 'master' of https://github.com/Seane235/Beeriodic
Merge branch 'master' of https://github.com/Seane235/Beeriodic
merging Beer and Family profile page functionality
added ratings display for Beer and Family models
jquery add
Merge branch 'test'
Merge pull request #7 from PLopezD/master

jquery start
add user edit profile ability. users can only edit their own profile. they will not see an option to edit profile if they view another user's page
remove the extra families migration
gemfile conflict resolution