vindovs kurva!
Merge branch 'master' of github.com:whysoserious/jpgomator

Conflicts:
	config.properties