added new timer
Merge branch 'master' of https://github.com/barinova/MM1Model

Conflicts:
	Program.cs