Merge conflicts between master and liv for rebasing
update App.java for merging
update SoundFileConverter.java for delivery to Mr Customer
conflict resolve
conflict resolved for merging
First delivery for delighted customer
merge local master with origin
Fix formatting and comments
Add gitignore
Merge App.java with rollback
Add Converter again