Buggy slideshow update WIP
Merge branch 'dspstanky' of github.com:DnDCity/DnDCity into dspstanky
Commit to pull master
Merge branch 'master' into dspstanky

Conflicts:
	app/assets/stylesheets/framework_and_overrides.css.scss
	app/assets/stylesheets/scaffolds.css.scss
	app/views/home/index.html.haml