one step back
Merge branch 'master' of https://github.com/jakhaf/countdown

Conflicts:
	JS/countdown.js