conflict resolved
Merging Conflicts
Merging Header
Merge branch 'gh-pages' of https://github.com/cslackdesign/grads.algonquindesign.ca into gh-pages