Buggy slideshow update WIP
Merge branch 'dspstanky' of github.com:DnDCity/DnDCity into dspstanky
Save Point...
Merge branch 'master' of github.com:DnDCity/DnDCity
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
Merge branch 'master' of github.com:DnDCity/DnDCity
 Committer: Lesyriad <lesyriad@Ubuntu-Server.(none)>

 On branch sean
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   app/views/weapons/_form.html.haml
	modified:   app/views/weapons/index.html.haml
Merge branch 'master' into sean

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	new file:   features/step_definitions/weapons.rb
	new file:   features/weapons.feature