guardar, cargar
Merge branch 'master' of https://github.com/jorgelp94/BreakingBad

Conflicts:
	src/breakingbad/JFrameBB.java
Merge branch 'master' of https://github.com/jorgelp94/BreakingBad