Merge branch 'gameRender' into dev
Initial commit to datastore branch with semi-working database code
merged game render into dev
Bryan has merged his dev and his datastore branch.
Bryan has updated the database and scores webpage so that new values can be inputted into the datastore
Merge branch 'model' into gameRender
Test to see how game values affect player values.
these are my error filled files
Merge pull request #17 from EJEHardenberg/deliverable2

Deliverable2
Merge branch 'deliverable2' into HAL
Merge branch 'deliverable2' into dev
I am updating the original datastore branch, which will now contain changes made in the model branch.
Syntax error was caused by the fact that I didn't place an extra closing parentheses for trying to read the request as a float.
added code to display name and description of characters
fixed merge conflict in choosePlayer.html
Merge branch 'master' into deliverable2
Merge branch 'session' into model
fixed merge conflicts in game as well as main
working on adding a new player to the datastore when he/she registers
Added Database stats to unit page