add login, friendship, UI and merge
merge a little bit
merge a lot
add comment, like
delete some files