Merge branch 'release/1.2.0' into develop
Tried to make player 2 buttons less confusing
Fixed timesink that caused the app to slow down after running timer for a while
Updated documentation and title of app
Fixed merge