..?
Merge branch 'master' of github.com:Theo13/PhotonSmash

Conflicts:
	Assets/Scene/Level1.unity
Merge branch 'master' of github.com:Theo13/PhotonSmash
yeah