#92 renamed grid classes in _grid.scss to be in line with BEM syntax, updated master.css
#92 modified based on feedback, got rid of unecessary use of sass extend
backmerging develop
resolving merge conflict
#92 resolving merge conflict locally