jade template
Merge branch 'rezed' into gh-pages

Conflicts:
	dist/assets/styles/common.css
	dist/index.html
update