resolve merge
Merge branch 'master' of github.com:khoadoan/slda-spark
Add Report for Milestone 2