Merge branch 'master' of https://github.com/Przytua/GitTest

Conflicts:
	main.py