Began work on updating FileSurveyor.
Resolved merge conflict.
Merge branch 'master' of github.com:JulianKunkel/siox
Merge branch 'master' of github.com:JulianKunkel/siox
Merge branch 'master' of github.com:JulianKunkel/siox
Merge branch 'master' of github.com:JulianKunkel/siox
Merge branch 'master' of github.com:JulianKunkel/siox
Merge branch 'master' of github.com:JulianKunkel/siox
Merge branch 'master' of github.com:JulianKunkel/siox
Merge branch 'master' of github.com:JulianKunkel/siox
Merge branch 'master' of github.com:JulianKunkel/siox
Adapting FileSurveyor to acknowledge seek class activities, first steps.
Merge branch 'master' of github.com:JulianKunkel/siox