requires merge
Merge branch 'master' of https://github.com/LBayer/ECSLCS-GroupC

Conflicts:
	db/schema.rb