Git is shit
Merge branch 'master' of https://github.com/CKovacs/JnRProject
Effect stuff
Merge branch 'master' of https://github.com/CKovacs/JnRProject

Conflicts:
	JnR/Assembly-UnityScript-Editor-vs.unityproj
	JnR/Assembly-UnityScript-Editor.unityproj
	JnR/Assembly-UnityScript-vs.unityproj
	JnR/Assembly-UnityScript.unityproj
	JnR/Assets/Prefabs/Players/3DNetworkPlayer.prefab
	JnR/Assets/Scenes/Demo11.unity
	JnR/Assets/Scripts/Network/Utility/InputDispatcher.cs