zmiany
zmiany2
zmiany2
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.cpp
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.cpp
asd