Conflicts:
	public/css/app.css
	resources/assets/sass/app.scss
	resources/assets/sass/pages/_welcome.scss
	resources/views/layouts/app.blade.php
	resources/views/welcome.blade.php