shelves.  fuck ya.
Merge branch 'master' of github.com:liseman/refillist

Conflicts:
	app/views/layouts/application.html.erb