Added the timebomb
Merge branch 'master' of http://github.com/noghri/moocow