temp push
schema change
shema change
schema chang
Merge branch 'master' of https://github.com/LBayer/ECSLCS-GroupC

Conflicts:
	app/models/ability.rb