Fixed timer bug
Merge branch 'screens' of https://github.com/teamcodeforfood/codecamp13 into screens