new
Merge branch 'master' of https://github.com/vicazi25/huega

Conflicts:
	New Text Document.txt
may quat 1