Ratings / Stars
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/users/classespast.blade.php