Merge pull request #5 from clauniel/master

pull from carsten
added task 2 "bounce bounce"
david source ha6 bugged, missing num hours then done