BUTOES A DAR
Merge branch 'Tiago'

Conflicts:
	BlackJack/BlackJack.sdf
	BlackJack/BlackJack.v11.suo
	BlackJack/BlackJack/BlackJack.cpp
	BlackJack/BlackJack/Release/BlackJack.log
	BlackJack/BlackJack/Release/BlackJack.obj
	BlackJack/BlackJack/Release/CL.read.1.tlog
	BlackJack/BlackJack/Release/CL.write.1.tlog
	BlackJack/BlackJack/Release/Source.obj
	BlackJack/BlackJack/Release/cl.command.1.tlog
	BlackJack/BlackJack/Release/vc110.pdb
	BlackJack/BlackJack/Source.cpp
	BlackJack/Release/BlackJack.pdb