Add Master Trainer Class Done
MC
Merge branch 'master' of https://github.com/Zarconium/crisp

Conflicts:
	application/models/classes.php