Merge branch 'seed' into update_tables
Not a working commit. Many tables added.
Changes to tables
Merge branch 'seed' into update_tables

Conflicts:
	db/seeds.rb
Two more table name fixes
Fixed breaks. Everything works again!
Merge branch 'update_tables' into layout

Conflicts:
	db/seeds.rb