s6 sync after review
Merge branch 's1_mainsimulation_implementation' of https://github.com/tomasaronjonsson/atmsimulator