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
Merge pull request #8 from unknownbreaker/master

Rob's changes: user can edit their own profile and view other users' profiles without editing theirs
add user login, user create, user destroy, user view own profile, index page now welcomes a user when signed in and gives option to go to own profile; if session cookie is nil then index page will ask for sign in or to create a new profile; user model modified to accommodate password authenticate
gemfile back to 2.1.2
Merge branch 'rob01'
Merge pull request #9 from unknownbreaker/master

Rob user sessions
beer ratings working, bug with family/families plurarls
view files updated
asyncronously update table with user's latest rating on the families profile and beers profile; added a partial for the ajax call
Merge pull request #10 from unknownbreaker/master

asyncronously update table with user's latest rating on the families pro...