PlayerFix
Merge branch 'master' of https://github.com/eolhing/towerRift

Conflicts:
Assets/scene2.unity
TestUseless.app/Contents/Data/Managed/Assembly-CSharp-firstpass.dll
TestUseless.app/Contents/Data/Managed/Assembly-CSharp.dll

TestUseless.app/Contents/Data/Managed/Assembly-UnityScript-firstpass.dll
TestUseless.app/Contents/Data/Managed/Mono.Security.dll
TestUseless.app/Contents/Data/Managed/System.Core.dll
TestUseless.app/Contents/Data/Managed/System.dll
TestUseless.app/Contents/Data/Managed/mscorlib.dll
TestUseless.app/Contents/Data/PlayerConnectionConfigFile
TestUseless.app/Contents/Data/mainData
TestUseless.app/Contents/Data/sharedassets0.assets
towerRift.userprefs
Merge branch 'master' of https://github.com/eolhing/towerRift

Conflicts:
	Assets/scene2.unity
	TestUseless.app/Contents/Data/Managed/Assembly-CSharp-firstpass.dll
	TestUseless.app/Contents/Data/Managed/Assembly-CSharp.dll

TestUseless.app/Contents/Data/Managed/Assembly-UnityScript-firstpass.dll
	TestUseless.app/Contents/Data/Managed/Mono.Security.dll
	TestUseless.app/Contents/Data/Managed/System.Core.dll
	TestUseless.app/Contents/Data/Managed/System.dll
	TestUseless.app/Contents/Data/Managed/mscorlib.dll
	TestUseless.app/Contents/Data/PlayerConnectionConfigFile
	TestUseless.app/Contents/Data/mainData
	TestUseless.app/Contents/Data/sharedassets0.assets
	towerRift.userprefs
player