Easy timer; Headbutt for Puju;
Merge branch 'master' of https://github.com/bjornswenson/mujujuju
Merge branch 'master' of https://github.com/bjornswenson/mujujuju