Changes stuff for conflict.
Merge branch 'master' of https://github.com/MurdoNZ/Test

Conflicts:
	JamesTest.txt
Merge branch 'master' of https://github.com/MurdoNZ/Test