Merge branch 'master' of C:\Users\JK\IdeaProjects\PrisonScoreboard with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Added Vault Dependency