some shit
Merge branch 'master' of https://github.com/mikroskeem/shells-project

Conflicts:
	main.py