Initial commit
updated readme
resolved merge conflicts