pullimise pärast
Merge remote-tracking branch 'origin/master'

Conflicts:
	POS/.gitignore
veel midagi committida