changed readme
merged conflict in environment readme
added text in readme