Initial commit
resolved readme conflicts