save crash
Merge branch 'new_branch'

Conflicts:
	Smorodinov/timer/css/style.css
	Smorodinov/timer/index.html
	Smorodinov/timer/script/script.js