Merge branch 'master' of https://github.com/jameslo0309/couchpos

Conflicts:
	README.md