andrdoid studd
Merge branch 'master' of https://github.com/thehogfather/chi-bingo

Conflicts:

platforms/ios/HelloWorld.xcodeproj/project.xcworkspace/xcshareddata/Hell
oWorld.xccheckout
	platforms/ios/www/index.html