working on charge2.ma
Merge branch 'master' of https://github.com/CNM190/Nightmare
working Candy for now
fixed merge
Proper Candy