testing git+unity
Merge branch 'develop' of https://github.com/UWMLI/thermo-golf into develop

Conflicts:
	ThermoGolf Unity4 Pro/ThermoGolf/Assets/Resources/Scenes/GameScreen/GameScreen.unity