Merge branch 'kmwsj' of github.com:payallmoney/pmhs_xsh into kmwsj

Conflicts:
	memo.txt
Merge branch 'kmwsj' of github.com:payallmoney/pmhs_xsh into kmwsj

Conflicts:
	memo.txt