variable names
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/planetTouch.cs
Merge branch 'master' of https://github.com/kirijiri/GalactosIntolerant