Wizard Changes

Somehow in the last push the wizard got ruined. I fixed his animations.
Merge branch 'master' of https://github.com/cschloer/CS361-Spectrum

Conflicts:
	Spectrum/Assets/Resources/Animations/Wizard.controller
	Spectrum/Library/assetDatabase3