second commit
Merge branch 'master' of github.com:xty1024/isko-cash

Conflicts:
	README
Merge branch 'master' of github.com:xty1024/isko-cash

Conflicts:
	README