Adding schema to the branch from Colette
Merge branch 'master' of https://github.com/emmath/life_cycle

Conflicts:
	db/schema.rb