changes
merge
friend list added
Merge branch 'master' of https://github.com/cashsun/fightclub