Sda
before merging to master
Merge branch 'master' of github.com:vicentebolea/MRR

Conflicts:
	src_mr/Makefile
	src_mr/countline.sh
	src_mr/master/Makefile