Eliminated input form for players and scores in the datastore.py file.
Merge conflict unresolved.
Updating datastore from the latest dev and scores branches.
Almost done updating everything from dev and scores.
Just a quick change to the scoreinfo.py file.
placeholder commit on dev before we merge datastore
Just a mistake I made with the scores.html template. This only serves to exit out of the branch.
fixed merge conflicts from merge of bryan's datatstore into dev