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

Conflicts:
	2014/css/general.css
	2014/index.html
Changing display block to in-line
fixing failed merges