skills update
Merge branch 'master' of https://github.com/freddybushboy/tlou-loadout
fix conflict