loading screen and timer done
Merge branch 'master' of https://github.com/charmjunewonder/BVW-Round-2

Conflicts:
	Assets/InputController.cs
	Assets/Models/Materials/girfriend-4.mat
	Assets/Models/Materials/girfriend-4.mat.meta
	Assets/Models/Materials/girfriend1-2.mat
	Assets/Models/Materials/girfriend1-2.mat.meta
	Assets/Models/Materials/girfriend1-hair1.mat
	Assets/Models/Materials/girfriend1-hair1.mat.meta
	Assets/Models/Materials/girfriend5.mat
	Assets/Models/Materials/girfriend5.mat.meta
	Assets/Models/Materials/girlfriend-head12.mat
	Assets/Models/Materials/girlfriend-head12.mat.meta
	Assets/Models/Materials/girlfriend-head2.mat
	Assets/Models/Materials/girlfriend-head2.mat.meta
	Assets/Models/Materials/girlfriend-head4.mat
	Assets/Models/Materials/girlfriend-head4.mat.meta
	Assets/Models/Materials/girlfriend-head5.mat
	Assets/Models/Materials/girlfriend-head5.mat.meta
	Assets/Models/girl2.fbm.meta
	Assets/Models/girl2.fbm/girfriend1-2.png.meta
	Assets/Models/girl2.fbm/girlfriend-booth.png.meta
	Assets/Models/girl2.fbm/girlfriend-hand2.png.meta
	Assets/Models/girl2.fbm/girlfriend-head2.png.meta
	Assets/Models/girl3.fbm.meta
	Assets/Models/girl3.fbm/girlfriend-booth.png.meta
	Assets/Models/girl3.fbm/girlfriend-hand2.png.meta
	Assets/Models/girl4.fbm.meta
	Assets/Models/girl4.fbm/girlfriend-booth.png.meta
	Assets/Models/girl4.fbm/girlfriend-hand2.png.meta
	Assets/Models/girl5.fbm.meta
	Assets/Models/girl5.fbm/girlfriend-booth.png.meta
	Assets/Models/girl5.fbm/girlfriend-hand2.png.meta
	Assets/Models/new girls/girl1.fbx.meta
	Assets/Scenes/GamePlay.unity