ADD: add scala files
Merge branch 'master' of https://github.com/lixian/java-demo.git

Conflicts:
	src/report/AnalyzerHandler.java
	src/report/Exp.java