Ignoring Library whee
Merge branch 'master' of https://github.com/Dunlain/CSC492-FinalProject

Conflicts:
	Assets/__Character Pack/Materials/samuzai_animation_ok-19 - Default1.mat
	Assets/__Character Pack/Materials/samuzai_animation_ok-20 - Default.mat