not sure what the changes are... to be figured out when merged with Tobin's
merged with senhorzinho's
Merge branch 'master' of https://github.com/hisakonog/DyslexDisorthGame into hisakonog-master

Conflicts:
	client/app/manifest.json
Merge branch 'hisakonog-master'