latest commit.

new Icon's for countdown
Even more merge errors!