add password
Merge branch 'master' of git@github.com:hotdog44/Group320.git
Merge remote-tracking branch 'lou/master'
add friendsList