Delete base.css
Delete style.css
Delete style-bak.css
┻━┻ ︵ヽ(`Д´)ﾉ︵﻿ ┻━┻
efjs o r /grz
lkn,.
Merge branch 'master' of https://github.com/roberttayco/CSN-GRC

Conflicts:
	base.css
	sass/_config.scss