added Building Cropsy section to README.md
resolved merge conflicts in README