initial commit
added read me
merge conflict in read me