xrctfyku
Merge branch 'master' of https://github.com/Hettan80/StateRepo

Conflicts:
	StateSolution/StateLib/ClockSetup.cs