123
Merge branch 'master' of https://github.com/agh-focus/vision

Conflicts:
	plik
rafal
Merge branch 'master' of https://github.com/agh-focus/vision