_
Merge branch 'master' of https://github.com/ProgerXP/Notepad2e

Conflicts:
	Notepad2.vcxproj