timer

whateverfuckyou
Merge branch 'master' of https://github.com/mayfer/pairit

Conflicts:
	timer.js
Merge branch 'master' of https://github.com/mayfer/pairit

Conflicts:
	timer.js
Merge branch 'master' of https://github.com/mayfer/pairit

Conflicts:
	timer.js