last week
Merge branch 'gh-pages' of https://github.com/jeffmccommas/wsd into gh-pages

Conflicts:
	css/styles.css
	images/toTop.png
	index.html
	js/jquery.easing.1.3.js