Winniugn
Fixed merge conflicts
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Fixin stuff
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #935 from ahomatthew/develop

Develop