.gitignore reglas
Merge branch 'development'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	storm.iml
Merge branch 'development'

Conflicts:
	storm.iml
Eliminación IML
Merge branch 'master' into development