Show a character for the male model
Merge remote-tracking branch 'origin/master' into JuanB

Conflicts:
	FinalProject/src/Scene/NormalScene.cpp
	FinalProject/src/Scene/NormalScene.h