changes from meeting
Merge branch 'master' of https://github.com/floAr/ADG_Scarlet_Gamma