minus photon
Merge branch 'master' of https://github.com/rickypickle/Melody-1978

Conflicts:
	Assets/Photon Unity Networking.meta
Merge branch 'master' of https://github.com/rickypickle/Melody-1978