local change
Merge branch 'master' of https://github.com/badkangaroo/GitRepo into testbranch

Conflicts:
	Assets/NewBehaviourScript.cs