Added friends
Merge branch 'master' of https://github.com/sbuchele/Jimmy