modify database
merge
Merge branch 'master' of https://github.com/jacpy/friend
add lib
conflict
Merge branch 'master' of https://github.com/jacpy/friend
exchange complete