some test code
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/clojure/com/renren/mc/t2/lab/example/ClojureInActionCh1.clj
some test code