fixed general.styl
Merge branch 'master' of https://github.com/yoyocicada/ocfc

Conflicts:
	public/css/general.styl