Merge pull request #1 from flyball/master

Updating with Matt's changes
added gui2

gui2 has a button, very ugly but will work on that
Merge pull request #1 from andrew310/master

Need update