Fixed timer and added testing
Merge branch 'master' of github.com:Bandits789/WhatSongIsItAnyway
merge merge merge