Added andy's fix
Another change
Tim's change
Tim's function added to my code
Merge branch 'Features/Andysfeature' into dev

Conflicts:
	Source1/MyCode.cpp