r
Merge branch 'master' of https://github.com/v4us/WIR

Conflicts:
	WIRDeamon.cpp