TUTORIAL Complete
CONFLICTS FIXED