aaa
jj
aaa
aaa
aa
aa
aa
Merge branch 'master' of https://github.com/TitaniumTeam/iCasino

Conflicts:
	.DS_Store
	Resources/.DS_Store
	Resources/controller/Game/tomcuaca.js
	Resources/view/vGame/vTomcuaca.js
aa
aaa
Merge branch 'master' of https://github.com/TitaniumTeam/iCasino