testing the changes for master branch
Merge branch 'master' of https://github.com/CuelogicTech/web-test
first comment
Merge branch 'master' of https://github.com/CuelogicTech/web-test
modifying textual changes
Merge branch 'master' of https://github.com/CuelogicTech/web-test
Merge branch 'master' of https://github.com/CuelogicTech/web-test
Prashant first edit on git
Merge branch 'development' of https://github.com/CuelogicTech/web-test into development
committing changes
Merge branch 'demoBranch' of https://github.com/CuelogicTech/web-test into demoBranch
generating conflicts