Commit Adrian Perez
Merge branch 'master' of ssh://git@github.com/calavera2013/ExamenB.git

Conflicts:
	ExamenB/src/Principal.java
Commit Adrian