Buggy slideshow update WIP
Merge branch 'dspstanky' of github.com:DnDCity/DnDCity into dspstanky
size features working
finished feature for size
updating cucumber results
moving cucumber results to public directory
Commit to pull master
adding in dice image and home page features
Merge branch 'master' of github.com:DnDCity/DnDCity
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
wip
Merge branch 'master' into rob
Merge branch 'master' of github.com:DnDCity/DnDCity
green
Merge branch 'master' into rob
cleanup
update
updating views and permissions