Just some stuff to do
Merge branch 'master' of https://github.com/SystemDragon/systemdragon.github.com

Conflicts:
	_config.yml