Merge branch 'work'
Merge branch 'work'
Merge branch 'work'
Merge branch 'work'
modify layout and colors, add links
Merge branch 'work'
Merge branch 'master' into release

Conflicts:
	source/index.slim
	source/stylesheets/index.sass