Merge branch 'master' of https://github.com/IEDave/ds2490286

Conflicts:
	Hangman/build/Debug/Cygwin_4.x-Windows/main.o

Signed-off-by: IEDave <dwsmit@dslextreme.com>