before pull
Merge branch 'master' of https://github.com/v-github/hackaton
before password
Merge branch 'master' of https://github.com/v-github/hackaton
passport setted