A try for GUI to work
fixed mergeconflict in GUI
Merge pull request #12 from buren/task_7_1

Task 7 1