Update project structure
Merge branch 'master' of https://github.com/khoadoan/slda-hadoop.git

Conflicts:
	slda/.gitignore