UGH AGAIN UGH
Next day trying to clean it up. Merge branch 'master' of https://github.com/sncollie/sncollie.github.io

Conflicts:
	_site/about/index.html
	_site/feed.xml
	_site/index.html
	_site/jekyll/update/2014/10/14/First-Post.html
	_site/jekyll/update/2014/10/14/welcome-to-jekyll.html
	_site/portfolio/index.html
	_site/sitemap.xml