Merge pull request #959 from brooksryba/develop

Develop
Finalized buttons and recurrsiveness
Fix merged confict
Merge pull request #969 from ahomatthew/develop

Develop
Poopla
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop