merge Switch

Conflicts:
	Assets/Prefabs/PlayerSound.prefab
	Assets/Prefabs/SoundRay.prefab
	Assets/Scripts/Door.cs

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Author:    Erik <ewstadler@gmail.com>
#
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#   (use "git push" to publish your local commits)
#
# Changes to be committed:
#   (use "git reset HEAD^1 <file>..." to unstage)
#
#	modified:   Assets/Scripts/GravityWall.cs
#	new file:   Assets/Scripts/Switch.cs
#


