.
Merge branch 'master' of github.com:eohernandez/BlackJack

Conflicts:
	nbproject/private/private.xml
Stand funcionando