Archivos de proyecto añadidos al repositorio.
Commit prueba

	new file:   .idea/copyright/profiles_settings.xml
	new file:   .idea/encodings.xml
	new file:   .idea/gradle.xml
	new file:   .idea/misc.xml
	new file:   .idea/modules.xml
	new file:   .idea/scopes/scope_settings.xml
	new file:   .idea/vcs.xml
new file:   ElectronicaDigital2014.iml
	new file:   gradle/wrapper/gradle-wrapper.jar
	new file:   gradlew
Merge branch 'master' of https://github.com/JavierLight/ElectronicaDigital2014

Conflicts:
	ElectronicaDigital2014.iml
Merge branch 'master' of https://github.com/JavierLight/ElectronicaDigital2014

Conflicts:
	ElectronicaDigital2014.iml