Remove psd and tif
Merge branch 'master' of github.com:dminik/voda2

Conflicts:
	.gitignore
dd
Merge branch 'master' of github.com:dminik/voda2

Conflicts:
	.gitignore
add gitignore
Merge commit 'ddd141733c6bf5585e34c79fc8e79df94e92c8f9'

Conflicts:
	.gitignore