changes
Merge branch 'master' of https://github.com/Trayus/phylactery

Conflicts:
	phylacterydeck.json
	souldeck.json