merged gui to master
Merge branch 'master' of https://github.com/martin31821/CodeGreen