add tp 3
add tp 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cardMain.py
add tp 3
add tp 3