work in progress -> merge :(
Merge branch 'master' of https://github.com/jocklas/devguiGroup8