Merge pull request #11 from cpaika/master

Bug fix
Merge pull request #12 from cpaika/master

Adding in friend logic
Bug fix with user creation