---
Merge branch 'master' of https://github.com/corpusc/Paramancer

Conflicts:
	Assets/Resources/Item/Weap/Arsenal.cs