Merge branch 'teo' into Merge

Conflicts:
	app/views/inserts/index.html.erb
	db/seeds.rb
Merge branch 'teo' into Merge

Conflicts:
	app/views/inserts/index.html.erb
	db/seeds.rb