Merge branch 'master' of https://github.com/PGrudniewski/InitialUnityProject

Conflicts:
Assets/Scenes/Test.unity