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

Conflicts:
	.gitignore
	_site/assets/js/fancy.js
Merge branch 'master' into 2014

Conflicts:
	.gitignore
trying to port over resume
here it is
Merge branch 'master' into 2014

Conflicts:
	.gitignore
	_includes/subnav.html
	_posts/pages/2013-10-27-internet.md
Working for taskrabbit and increasing some type sizes
Merge branch '2014'