Made it to compile...
Merge branch 'master' of github.com:OllieB/FriendLend