Created basic Swing GUI functionality
Merge branch 'master' into karl1245
Merge branch 'karl1245'