Merge pull request #967 from ahomatthew/develop

Develop
working on the button requirements
Up-to-date
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop