DEV
Merge branch 'master' of https://github.com/vadimmelnicuk/H

Conflicts:
	Main.c