Initial commit
Merge branch 'dev'
test
transform data
Merge branch 'dev' of https://github.com/wangyuxue/scala_program into dev

Conflicts:
	src/com/baidu/scala/demo/bigdata/BigDecimalTest.scala