cleaned up gui-related code
Merge branch 'master' of https://github.com/lukasgemar/final_project