Merge branch 'master' of https://github.com/fox-squirrels-2013/Bear-Punch into Benedikt_Daniel
Moved friend-database-adding logic to model
Merge pull request #23 from fox-squirrels-2013/Benedikt_Daniel

Benedikt daniel