Update
Merge branch 'master' of https://github.com/kramkiste/kramkiste.github.com

Conflicts:
	_posts/2013-08-15-gaming.md