ignore
Merge branch '2014' of https://github.com/okayjeffrey/okayjeffrey.github.io into 2014

Conflicts:
	.gitignore
	_site/assets/js/fancy.js