Got system working.
Fixed case statement merge conflict.
Nothing new. We can probably ignore whatever I did
wip
Merge branch 'master' into rob
green
Merge branch 'master' into rob
cleanup
update
updating views and permissions
adding static asset serving to production
fixing asset path
all tests pass
tests green
Merge branch 'sean' of github.com:DnDCity/DnDCity into sean

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
green