Merge branch 'master' of C:\Users\janiec\PycharmProjects\goView with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.py