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