changed some string names, got FriendList to populate
merge conflict resolution
Merge pull request #10 from Kevin-Damazyn/gui

Gui