newstim
Merge branch 'master' of https://github.com/amyskerry/NDE
forgot to pull
fixing stims