fixed concatanation error with int to str
Fixing merge conflicts in stateChanges and game.html
Merge branch 'dev' of github.com:the-hobbes/softwareEngineeringFinalProject into dev
didn't actually fix the merge conflict becuase I forgot to save. Joyous occasion:
Added empty arrays to renderState calls because trying to index an undefined variable doesnt work so well. Even with the silliness of javascript
fixed merge conflicts after pull from ethan's dev