grr
Merge branch 'master' of https://github.com/vangoghjoe/CN_Conv
Merge branch 'master' of https://github.com/vangoghjoe/CN_Conv
Merge branch 'master' of https://github.com/vangoghjoe/CN_Conv
Merge branch 'master' of https://github.com/vangoghjoe/CN_Conv

Conflicts:
	libConversion.ps1