initial commit
added a second line
add plan file
added a makefile
README changed in the master branch
README changed in test branch
conflict is resolved
Merge https://github.com/anubhavseth/firstgit