calc year max temperature
Merge branch 'master' of github.com:dengjie420/stats-hdfs

Conflicts:
	.gitignore
fixed gitignore