updating grunt
fixing the media queries
adding extends
in an if statement now
Merge branch 'dev'