working on charge2
Merge branch 'master' of https://github.com/CNM190/Nightmare