Re-enabling combiner.
Merge branch 'master' of github.com:maxhutch/big-data-project

Conflicts:
	hadoop/Makefile
	hadoop/Tiling.java