-
Merge branch 'master' of github.com:sundowndk/Didius
Merge branch 'master' of github.com:sundowndk/Didius

Conflicts:
	Binary/Release/Didius/Didius.dll
	Source/Didius/Didius/Helpers.cs