test scaffold

Conflicts:
	config/database.yml