Merge pull request #1 from Colegreen/master

merge cole's changes into my code
Rename classes, put output on GUI
Refactor, run cole's parse on button press
Merge pull request #2 from brandonforster/master

pull