Merge branch 'seed' into layout
Didn't change much
Merge branch 'seed' into layout

Conflicts:
	db/seeds.rb
Merge branch 'update_tables' into layout

Conflicts:
	db/seeds.rb
Fixed seed file
Computer Images up-to-date
Added Locations and copy centers to seed
Layouts updated for all current tables
Admin menu created and layouted
Merge branch 'layout'