Merge remote-tracking branch 'origin/Johnny'

Conflicts:
	Assets/Scenes/LazyGreenTest.unity
Now forced text mode for ease of use with Git
Merge branch 'master' of https://github.com/torrmercury/Lazy-Green into Johnny

Conflicts:
	Assets/Scenes/LazyGreenTest.unity