added GUI to johannes
Merge branch 'master' into sean