no butts
Merge branch 'master' of https://github.com/Brolita/OpSysHomework4

Conflicts:
	main.py
fixed parser