changing some values to reflect game better
Merge branch 'master' into gh-pages