forgot to change timer time back to random after testing
Merge branch 'master' of https://github.com/Nishant-MC/CS-AD-209-Software-Engineering