Testing pagerank
Merge remote-tracking branch 'origin/master'

Conflicts:
	MapReduceFramework/src/TestJob.java