mine
Merge branch 'master' of https://github.com/rushimusmaximus/exiftool

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/rushimusmaximus/exiftool

Conflicts:
	.idea/workspace.xml
removed compiled classes, added to .gitignore
Merge branch 'master' of https://github.com/rushimusmaximus/exiftool