Init
Merge branch 'master' of github.com:astray0924/hadoop_pagerank_new

Conflicts:
	.gitignore