changes from windows box
Merge branch 'master' of https://github.com/jaybny/fantasybit

Conflicts:
	src/Commissioner.cpp