modified:   _layouts/master.html
	modified:   _site/2012/05/hockey_nat.html
	modified:   _site/2012/05/slack.html
	modified:   _site/2012/07/shh-it-is-an-update-post.html
	modified:   _site/2012/10/must-do-this-more-often.html
	modified:   _site/2012/10/out-of-date-instructions-argh.html
	modified:   _site/2012/10/upcoming-vacations.html
	modified:   _site/2013/06/really-i-should-do-this-more-often.html
	modified:   _site/2013/07/cutting-the-cable.html
	modified:   _site/2013/07/take-control-of-your-remotes.html
	modified:   _site/2013/07/vacation-time-an-update.html
	modified:   _site/2013/07/what-glitters-is-not-always-gold.html
	modified:   _site/2013/09/darn-you-nhl-and-your-crappy-schedule-changes.html
	modified:   _site/2013/09/the-big-data-migration-affair.html
	modified:   _site/about.html
	modified:   _site/assets/primary.css
	modified:   _site/index.html
	modified:   assets/primary.css
Merge branch 'master' of https://github.com/bwhinnen/bwhinnen.github.io

Conflicts:
	_site/assets/primary.css
	assets/primary.css

	deleted:    _site/assets/primary.css
	deleted:    assets/primary.css
	new file:   _site/assets/primary.css
	new file:   assets/primary.css