modified shiz
Merge branch 'master' of https://github.com/mikeharfoot/experiment

Conflicts:
	shiz.txt