stuff
Merge branch 'master' of https://github.com/freddybushboy/tlou-loadout

Conflicts:
	apple-touch-icon-precomposed.png
icon styles