add deets about local dev to README
move border-radius to parent
fix merge conflict