Added timer + progressbar and css-transition
solved conflicts added timebar and transition