sinbad
Merge branch 'master' of https://github.com/silver17/Silveri-meeskond

Conflicts:
	POS/bin/.gitignore
	POS/log/log.log