Count Up
Merge branch 'master' into CountUp

Conflicts:
	VSHackathonTimerTest/UnitTest1.cs