User and profile
Merge pull request #2 from rishey/profile

User and profile