another commit
Merge branch 'master' of https://github.com/bend0303/AudioFind

Conflicts:
	.idea/workspace.xml