test
Merge branch 'master' of https://github.com/domasmar/os1

Conflicts:
	src/os1/Main.java