change .gitgnore
Merge remote-tracking branch 'origin/yanxi'

Conflicts:
	.gitignore
change readme
Merge pull request #2 from yanxi-com/yanxi

add management
Merge pull request #3 from yanxi-com/yanxi

Yanxi
Merge pull request #4 from yanxi-com/yanxi

update
change navbar to tmall directly
Merge branch 'yanxi'

Conflicts:
	views/include/header.ejs
Merge branch 'yanxi' of https://github.com/yanxi-com/qiri.com
Merge branch 'yanxi' of https://github.com/yanxi-com/qiri.com
Merge branch 'yanxi' of https://github.com/yanxi-com/qiri.com
Merge branch 'yanxi' of https://github.com/yanxi-com/qiri.com
Merge branch 'yanxi' of https://github.com/yanxi-com/qiri.com
Merge branch 'yanxi' of https://github.com/yanxi-com/qiri.com
Merge branch 'yanxi' of https://github.com/yanxi-com/qiri.com
Merge branch 'yanxi' of https://github.com/yanxi-com/qiri.com
Merge branch 'yanxi' of https://github.com/yanxi-com/qiri.com
Merge branch 'yanxi' of https://github.com/yanxi-com/qiri.com
Merge branch 'yanxi' of https://github.com/yanxi-com/qiri.com
Merge branch 'yanxi' of https://github.com/yanxi-com/qiri.com