style changed
Merge branch 'master' of github.com:DuoHuoStudio/iDocument

Conflicts:
	views/header.ejs