la verdad que no tengo idea que estoy haciendo :)
Te gané?

Merge branch 'master' of https://github.com/Soulforged/ecgdoctor

Conflicts:
	src/test/java/edu/uk/dromm/img/impl/HistogramSegmentationTest.java
	src/test/java/wfdb/WfdbTest.java
Merge branch 'master' of https://github.com/Soulforged/ecgdoctor