tests for user profile page
fixed merge conflicts
Merge pull request #12 from alexcodreanu86/user

User