some fixxes
Merge branch 'master' of https://github.com/Apophis3000/MapReduceSimulator

Conflicts:
	MapReduce/MapReduce.v12.suo
	MapReduce/MapReduce/App.config
	MapReduce/MapReduce/bin/Debug/MapReduce.exe
	MapReduce/MapReduce/bin/Debug/MapReduce.exe.config
	MapReduce/MapReduce/bin/Debug/MapReduce.pdb
	MapReduce/MapReduce/bin/Debug/MapReduce.vshost.exe.config
	MapReduce/MapReduce/obj/Debug/MapReduce.exe
	MapReduce/MapReduce/obj/Debug/MapReduce.pdb