Merge branch 'master' of github.com:stevschmid/track-o-bot

Conflicts:
	src/Window.cpp
Merge branch 'master' of github.com:BOSSoNe0013/track-o-bot

Conflicts:
	src/Window.cpp

Conflicts:
	src/Window.cpp
solve conflict