falta testar o dispenser
falta testar
testa isto
mt lento
asdasdasdasda
Merge remote-tracking branch 'origin/Tiago' into Tiago

Conflicts:
	BlackJack/BlackJack.sdf
	BlackJack/BlackJack.v11.suo
	BlackJack/BlackJack/BlackJack.cpp
	BlackJack/BlackJack/BlackJack.h
	BlackJack/BlackJack/BlackJack.vcxproj.filters
	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/Card.obj
	BlackJack/BlackJack/Release/Pattern.obj
	BlackJack/BlackJack/Release/RGBpixmap.obj
	BlackJack/BlackJack/Release/Source.obj
	BlackJack/BlackJack/Release/cl.command.1.tlog
	BlackJack/BlackJack/Release/vc110.pdb
	BlackJack/Release/BlackJack.pdb
add button
Merge branch 'Tiago' of https://github.com/jjsfoliveira/rvau into Tiago

Conflicts:
	BlackJack/BlackJack.sdf
	BlackJack/BlackJack.v11.suo
	BlackJack/BlackJack/BlackJack.cpp
	BlackJack/BlackJack/BlackJack.h
	BlackJack/BlackJack/BlackJack.vcxproj.filters
	BlackJack/BlackJack/Dispenser.h
	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/Card.obj
	BlackJack/BlackJack/Release/Pattern.obj
	BlackJack/BlackJack/Release/RGBpixmap.obj
	BlackJack/BlackJack/Release/Source.obj
	BlackJack/BlackJack/Release/cl.command.1.tlog
	BlackJack/BlackJack/Release/link.command.1.tlog
	BlackJack/BlackJack/Release/link.read.1.tlog
	BlackJack/BlackJack/Release/vc110.pdb
	BlackJack/BlackJack/Source.cpp
	BlackJack/BlackJack/assets/dispenser.mtl
	BlackJack/Release/BlackJack.pdb
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/Card.obj
	BlackJack/BlackJack/Release/Source.obj
	BlackJack/BlackJack/Release/cl.command.1.tlog
	BlackJack/BlackJack/Release/vc110.pdb
	BlackJack/Release/BlackJack.pdb