classroom

changes
Merge branch 'master' of https://github.com/zgumby85/unityproject

Conflicts:
	New Unity Project 3/Assets/scenes/the classroom.unity
Merge branch 'master' of https://github.com/zgumby85/unityproject