First Commit
Modified README.md file
added feature 1
feature 2 added
Merged master fixed conflict