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

Conflicts:
	2014/launch.html
	_includes/css/flipclock.css
fix launch
fix launch css
merge conflicts (I hope)