muudetud gitignore
Merge branch 'master' of https://github.com/Antson/op-sys

Conflicts:
	.gitignore