fix to methods

compare and merge now call their methods on the list of files instead of
arraylists and first two files that are selected
formatting fix

-uppercase some methods
-toString() fix for spacing between attributes