Git now uses uniform line endings

Also made minor changes to Main.java