Merge pull request #6 from sethmoon/master

Swing GUI
Merge pull request #40 from zcmoore/master

Merge pull request #6 from sethmoon/master