git test (just a comment in GUI.java)
Merge branch 'master' of https://github.com/danvas/cs304-part3.git