Using code blocks.
Merge branch 'master' of github.com:markpitchless/home

Conflicts:
	.codeblocks/default.conf