try
Merge branch 'master' of github.com:franzzzz/franzzzz.github.com

Conflicts:
	404.html
	_includes/themes/the-minimum/default.html