working on adding friends
Merge branch 'master' of https://github.com/scobb/Impromptu
adding friends is kinda working
Merge branch 'master' of https://github.com/scobb/Impromptu