Merge pull request #66 from decebaldecebal/master

Readd basic armo(u)rs
Merge pull request #2 from BrassGoggledCoders/master

Pull in Rare's Changes
Began to fix the weird stuff that happened when Rare merged
Actually fixed the weird/derpy stuff

Rare is having folder tracking problems o.0
Merge pull request #67 from warlordjones/master

Fixed the derpy stuff...
Merge branch 'pr/68'
Resolve Conflicts
Merge pull request #1 from decebaldecebal/main/master

Main/master