timer stuff
Merge branch 'master' of https://github.com/salois-m/FelineFightClub