archivos de rubymine
database
Merge remote-tracking branch 'origin/master'

Conflicts:
	smte_project/.gitignore
	smte_project/config/database.yml