modified:   views/index.jade
	modified:   public/images/index/background2.jpg
Merge branch 'master' of https://github.com/ceosius/cmj

Conflicts:
	public/images/index/background2.jpg
merge