update
Merge branch 'master' of https://github.com/ivanpop/stopwatch

Conflicts:
	stopwatch/Form1.Designer.cs
	stopwatch/Form1.cs