small stuff
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo
fixed that serious shield bug that no one noticed