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

Conflicts:
	tracker/bin/Debug/tracker