BAM
Merge branch 'master' of github.com:BigIroh/pai-sho

Conflicts:
	package.json