first commit
readme updates
resolved merge conflicts