Merge branch 'prototype' of https://github.com/8BitRick/VRBase into prototype

Conflicts:
	Assets/Scenes/BasicScene.unity