syalala
Merge branch 'master' of https://github.com/zakazai/ceteor

Conflicts:
	.sass-cache/5ed3b3392115beab1ca35194f0dd1cd10ce4d885/style.scssc
	stylesheets/style.css