added new file and changed readme
added 6th line in readme
fixed conflict with merge