Gitignore conflict
Merge branch 'DataTempreture' of https://github.com/HazelChen/hadoop.git into DataTempreture

Conflicts:
	bin/.gitignore