testing, hopefully working now. it was a github error
Merge branch 'master' of https://github.com/Eternaldoom/Realms-of-Chaos

Conflicts:
	capes.json