change
Merge branch 'master' of github.com:D3Hunter/misc

Conflicts:
	note.txt