bug fixes, turret works, texture switching... stuff stuff stuff..
Merge branch 'master' of https://github.com/ZavaStudios/SeniorCapstone

Conflicts:
	Assets/mainGame.unity