Initial commit
resolved conflict in read me