changed follow links
Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/css/app.min.css