merge thread with pre code

change back line 101 in welcomeWindow.java later:

totalPanel.setBorder(BorderFactory.createEmptyBorder(15, 15, 15, 15));