added new content
added new comment to readme file
merged branches and conflict solved
merged and solved conflicts