Merging README and README.md
Relicensed under the BSD 3-Clause license