canvas
Merge branch 'master' of https://github.com/jkatsnelson/defacethehood

Conflicts:
	client/defacethehood.css
Merge branch 'master' of https://github.com/jkatsnelson/defacethehood
canvas
Merge branch 'master' of https://github.com/jkatsnelson/defacethehood