Made tracking more clever
Merge branch 'master' of https://github.com/Nebulai/dotdemo

Conflicts:
	main.c