fix
delete code
added
Merge branch 'master' of https://github.com/himaaaatti/os

Conflicts:
	.gitignore
	README.md