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

Conflicts:
	commondeck.json