Doing Stuff
Merge branch 'gh-pages' of https://github.com/cslackdesign/grads.algonquindesign.ca into gh-pages

Conflicts:
_includes/css/general.css
Merge branch 'gh-pages' of https://github.com/cslackdesign/grads.algonquindesign.ca into gh-pages