perfect beautiful timer complete
Merge branch 'master' of https://github.com/akiyantseva/cs105

Conflicts:
	js/logic.js