tada
Merge branch 'master' of ssh://git@github.com/Nea5/GUI_project.git
javadoc