test
test
Merge branch 'cleaning'

Conflicts:
	index.html
	jade/index.jade
Merge branch 'master' into cleaning

Conflicts:
	jade/index.jade