added separate teacher timer and fixed teacher movement
Merge branch 'master' of https://github.com/timmyterrezza/EGDP1

Conflicts:
	Game/Assets/Scripts/teacherMovement.cs