Commit
Merge branch 'master' of https://github.com/Lincor/VM

Conflicts:
	main.c