Added some shorts, upgraded to jekyll 1
Merge branch 'master' of http://github.com/benjaminmikiten/benjaminmikiten.github.com

Conflicts:
	_posts/2013-05-08-ten-commandments.html