Debugging master_controller kill
Merge branch 'master' of https://github.com/kendetta/HMS-Git