Test
Merge branch 'master' of https://github.com/friskydingo/goteams
Merge branch 'master' of https://github.com/friskydingo/goteams
The teams now have different colours and the timer is no longer displayed
Merge branch 'master' of https://github.com/friskydingo/goteams