user profile
profile merge
Merge pull request #11 from ror-final-project/profiles

Profiles