Merge intocables into HEAD

Conflicts:
	src/blackjack/Blackjack.java
Merge origin/master into secundaria