Added various comments and some formatting changes.  Split up the ConflictFinder.run function into two separate methods.
Fixed waiting forever when not running through subdirectories.  Changed application icon to the icon.