strteed with S2
Merge branch 'master' of github.com:Ratniko/EDA122