model
Merge branch 'master' of https://github.com/Save92/ScrumProject

Conflicts:
	app/database/seeds/DatabaseSeeder.php
	app/models/Classe.php