merge
Merge branch 'master' of https://github.com/eudyptula/Encourage
fixed bugges and finisehed list