Different shot types, guy text
Push
Merge branch 'master' of https://github.com/smyrick/eecs499

Conflicts:
	Unity/CastleDefense/Assets/Scenes/Level.unity
	Unity/CastleDefense/Assets/Scripts/Cannon/CannonShoot.cs