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

Conflicts:
	2014/js/flipclock.js