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

Conflicts:
	resources/sass/app.scss
Merge remote-tracking branch 'origin/master'