database completed
Merge branch 'database_creation'

Conflicts:
	config/database.yml