commit megre
Merge branch 'master' of https://github.com/xiaoqi55125/otus-pss

Conflicts:
	appConfig.js
	views/layout.html
add static files