add user profile
fix merge conflict
Merge pull request #36 from vlee90/vincent-branch

Added Different Users!