Text on Screen
Merge remote-tracking branch 'origin/master'

Conflicts:
	Nanoshot/Assets/GameScene.unity