....
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/checkOrder/status5no.blade.php
	app/views/checkOrder/status5yes.blade.php