bonus for parent
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb