Merge branch 'master' of https://github.com/KDJones2/wifilapper-1

Conflicts:
	PitsideConsole/PitsideConsole/DlgTimingScoring.cpp
	PitsideConsole/PitsideConsole/DlgTimingScoring.h
Failed merge commit
Merge branch 'master' of https://github.com/KDJones2/wifilapper-1

Conflicts:
	PitsideConsole/PitsideConsole/DlgTimingScoring.cpp
	PitsideConsole/PitsideConsole/DlgTimingScoring.h