test
fix
fix
Merge branch 'v2' of https://github.com/KrzysiekF/kkcountdown into v2

Conflicts:
	js/kkcountdown2.js