maj
Merge branch 'master' of https://github.com/Dossandos/Plastock

Conflicts:
	app/storage/logs/laravel.log
Revert "maj"

This reverts commit cf89ad59dfbb64c9b4f322950d545a21fe1f3769.