ubuntu
Merge branch 'master' of https://github.com/NohponeX/notepad-x

Conflicts:
	Notepad-X.pro.user