UCHIC/ODM2 — pull request #14 by aufdenkampe (2014-02-14 19:02:41+00:00)
Title: Sampling features em

This is a test. I thought I resolved all conflicts, but for some reason it seems that GitHub isn't seeing everything that I did.