Working
Merge branch 'master' of https://github.com/dankearney/Das-Jaegermeister-ADCumz
SHIT
fixed merge conflict.......