fiddling while Rome burns
Merge branch 'master' of https://github.com/johns276/ritrack

Conflicts:
	log/test.log