updates from yesterday
heathers changes
Merge branch 'bowlDisplay' into divrestrictionsctd

Conflicts:
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
	app/views/specsheets/show.html.erb
	app/views/users/show.html.erb
colander and bottom grid saving