this is my first commit
added text to readme file
fixed readme merge conflicts