little changes to add the code columns
Fix conflicts in merge. Merge branch 'master' of github.com:joniamir/college_seminar_bi

Conflicts:
	db/schema.rb