Conclusions
Merge branch 'master' of https://github.com/GS42/mas2013