Drenius version
Merge remote-tracking branch 'origin/master'

Conflicts:
	_layouts/page.html
	_posts/2014-09-01-game-of-the-month.md