premerge commit
Merge branch 'master' of https://github.com/sabotai/masteringTedium

Conflicts:
	Mastering Tedium/Mastering Tedium.depend
	Mastering Tedium/Mastering Tedium.layout
	Mastering Tedium/bin/Debug/Mastering Tedium
	Mastering Tedium/main.cpp
	Mastering Tedium/obj/Debug/main.o