repo
Merge branch 'master' of github.com:lynneokada/Translation-Game

Conflicts:
	.project
	.settings/.jsdtscope
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	.settings/org.eclipse.wst.jsdt.ui.superType.container
	.settings/org.eclipse.wst.jsdt.ui.superType.name
	README.md
	contents/dicts.json
	contents/jquery/js/jquery-1.9.0.min.js
	contents/translate_game.css
	contents/translate_game.html
	contents/translate_game.js