Updated database connections in DatabaConnections.java to match our
database to fetch citynames, Removed merge comments that created errors
(like <<<<<HEAD), Removed calls to classes that have been renamed in
Main.java and removed merge comments from TestUiFrame.java.

GUI and TestUiFrame.java contain code with errors. I assume that
something needs to be added to Main.java.