armors
Merge branch 'master' of github.com:johnHackworth/joust
armor tweaking