slider changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/css/app.css
Merge branch 'master' of https://github.com/12sm/davinmccoy