committing small additions to multiplayer navbar before merging master into my branch
fixed merge conflicts
merged index.html
got master branch working properly again