Merge pull request #4 from tsclhlimmer/master

Combine our stuff
removed main method, added gui class
Merge pull request #5 from tsclhlimmer/master

made it work
Merge pull request #4 from Wartz/master

working program