finalize all jobs
Merge branch 'final_touches'

Conflicts:
	db/seeds.rb