fix conflict
Merge branch 'master' of github.com:LucienMoor/RatingOutfit

Conflicts:
	ratingOutfit/app/views/subview/header.blade.php