timer did not function
Merge branch 'master' of https://github.com/hmojica/DarkBunny