various competition day changes...
Revert "various competition day changes..."

This reverts commit c28b68674d8e6efa09bf30ea8f5a365ae3f42f2b.
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master
stylistic edit