before pull
Merge branch 'master' of github.com:dpek/cs354s-teleport-man

Conflicts:
	Assets/Game/Controllers/PlayerController.cs
	Assets/Scenes/TestLevel.unity
before pull
before pull
Merge branch 'master' of github.com:dpek/cs354s-teleport-man
Merge branch 'master' of github.com:dpek/cs354s-teleport-man

Conflicts:
	Assets/Scenes/Levels/Level0.1.unity
	Assets/Scenes/Levels/Level0.2.unity
	Assets/Scenes/TestLevel.unity
Merge branch 'master' of github.com:dpek/cs354s-teleport-man
teleportation no ray
Merge branch 'master' of github.com:dpek/cs354s-teleport-man