first commit
Merge branch 'master' of https://github.com/pcartagena/vocabumonkey-apk

Conflicts:
	playgame.html
	settings.js
Merge branch 'master' of https://github.com/pcartagena/vocabumonkey-apk

Conflicts:
	playgame.html
	settings.js