new grid w/o csswizardry
resoved pull conflicts, added new grid sass