updated and removed bugs
Merge branch 'master' of https://github.com/violatingcp/Dummy

Conflicts:
	Puppi/test/makingBacon_MC_MJ.py
updated