Trail for player 1
Merge branch 'master' of https://github.com/compilechicken/final-destination

Conflicts:
	Assets/InControl/Library/VersionInfo.cs
	Assets/Scenes/GameScene.unity
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/InControl/Library/VersionInfo.cs
	Assets/Prefabs/LaserModel.prefab
	Assets/Scenes/GameScene.unity
no message
Merge branch 'master' of https://github.com/linkleonard/final-destination

Conflicts:
	Assets/InControl/Library/VersionInfo.cs