windows
Merge branch 'master' of https://github.com/mntmn/merlinbitte

Conflicts:
	src/merlinbitte.cpp
windows