README.md heading
readme
Merge branch 'master' of git://github.com/eliotpbrenner/SparsityBoost

conflict in README resolved