ul
Merge branch 'gh-pages' of https://github.com/jgscott/SSC325 into gh-pages

Conflicts:
	_posts/2013-01-14-week01.md