Merge pull request #1 from n0va/local

Added some GUI
Merge branch 'master' of github.com:n0va/test1 into local