-
Merge branch 'master' of https://github.com/Natsirtt/bugfree-ironman

Conflicts:
	tracker/bin/Debug/tracker