moved scenes, touch code, basically that's it.

moved touch code to new PlayerTouch script attached to GameManager.
Obviously GameManager will need to every scene, along with existing
Meta/Author status quo.
Merge remote-tracking branch 'origin/master'

Conflicts Rsolved:
	Assets/GamePieces/Button.cs
	Assets/GamePieces/GamePiece.cs
	Assets/GamePieces/Keyhole.cs
derp fine w/e
I accepted Harris' source as gospel of God. This time commiting via VS.

Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/GamePieces/Antitrap.cs
	Assets/GamePieces/Button.cs
	Assets/GamePieces/End.cs
	Assets/GamePieces/GamePiece.cs
	Assets/GamePieces/Key.cs
	Assets/GamePieces/Keyhole.cs
	Assets/GamePieces/Placeholder.cs
	Assets/GamePieces/Switch.cs
	Assets/GamePieces/Teleport.cs
	Assets/GamePieces/Tile.cs
	Assets/GamePieces/Trap.cs
	deploy/deploy.html