ID added in calc.html
 ID added in calc.html in feature1
Conflicts resolved
.gitignore file added
Readme file added