Merge branch 'master' of github.com:aaronlifshin/aaronlifshin.github.io into May14

Conflicts:
	_includes/head.html
	_layouts/default.html