welder refactor
Merge branch 'master' of
https://github.com/CodeFusionOne/CSCI3130_Project.git

Conflicts:
	java/com/csci3130/inventory/ContainerMagicalWelder.java