Finished button stuff
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #971 from ahomatthew/develop

Develop