i did something
html and css updates
Merge branch 'master' of https://github.com/mdorrance/toiletpaper

Conflicts:
	app/views/items/index.html.erb