initial commit
adds readme
removing merge conflicts