Forgot to create equipment table in shop because I'm a bad
Merge remote-tracking branch 'origin/master'