Zmena gitignore
Merge branch 'master' of https://github.com/evergrey/vltava-yacht

Conflicts:
	.idea/workspace.xml