Merge branch 'gh-pages' of https://github.com/Sealtyel/Android-Engineering-Toolbox
push antes de pull
Merge branch 'master' of https://github.com/Sealtyel/Android-Engineering-Toolbox
cambio event an ListRedesAdapter
Calculadora Ley de Ohm Listo
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/sealtyel/example/com/engineeringtoolbox/OhmCalculatorFragment.java
arreglando sabotaje del Buelna....
arreglando sabotaje del Buelna.....