first commit
Merge branch 'master' of https://github.com/Dean-Shi/spark-boilerplate

Conflicts:
	README.md