blocking for second shot in charge2

q
Merge branch 'master' of https://github.com/CNM190/Nightmare
scene .yaml file changed in master