Merge branch 'master' of github.com:uspgamedev/vikings
Armor outside debug mode.
Merge branch 'nodebugarmor'