dor bad loiter
Merge branch 'master' of https://github.com/sblonder/QuadTLD

Conflicts:
	src/Main.cpp