Coffee card style improved, timer creation started
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/coffeecard.js
Merge branch 'master' of https://github.com/Ulys/scrum-pocker