Controlling map reduce done, now need to implement Partitions
Resolved merge conflicts
Merge branch 'master' of https://github.com/simondai13/Projects-DS.git

Conflicts:
	DSProject3/src/Histogram.java
	DSProject3/src/Main.java