point
Merge branch 'development' of github.com:paomian/clojure-china into development
Merge branch 'paomian' into development

Conflicts:
	src/clojure_china/account/controller.clj
fix the comment  prarm -> param
Merge pull request #13 from zjhmale/zjhsdtc_dev

fix the comment  prarm -> param
point
Merge branch 'development' of https://github.com/paomian/clojure-china into development
fix a fatal error on readme
Merge pull request #15 from zjhmale/zjhsdtc_dev

fix a fatal error on readme
Tidying up README.md and sample files
Merge pull request #17 from lorettahe/development

Tidying up README.md and sample files