initial commit - added README
resolved merge conflict