add in some changes
Merge branch 'master' of https://github.com/ctorney/ungTracker

fixed a conflict
Conflicts:
	testArea/main.py