Views
Merge branch 'master' of https://github.com/v2000/jsMiniCms

Conflicts:
	views/menuFront.jade