finishing off updating and pushing to github
test
Merge branch 'master' into local

Conflicts:
	src/main/resources/assets/sandboxmod/textures/items/SwordTest.png