changing name to alex
resolved conflict!

using both numbers
test
done merging
removing orig
done
Merge branch 'master' of https://github.com/badkangaroo/GitRepository

Conflicts:
	Assets/NewBehaviourScript.cs