subota
Merge branch 'master' of https://github.com/pug-by/project1

Conflicts:
	views/indexApp.jade