update gitignore
Merge branch 'master' of github.com:zhongmoxi/flask
entry_page style
Merge remote-tracking branch 'origin/master' into entry_page