update this branch so it's up to date with dev
Merge branch 'feature-timer' of https://github.com/pelferina/wpi-suite into feature-DBGameModel