ignore
Merge branch 'master' of github.com:yasaswyk/MapReduce
Merge branch 'master' of github.com:yasaswyk/MapReduce
Merge branch 'master' of github.com:yasaswyk/MapReduce
eg 2 working, eg 3 not completed
Merge branch 'master' of github.com:yasaswyk/MapReduce

Conflicts:
	src/mapred/stuff/Mapper.java
	src/mapred/stuff/Reducer.java