changes in new branch
adding new file
adding file
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
Merge branch 'master' of https://github.com/CuelogicTech/web-test
design branch
Merge branch 'testing_branch'
Merge branch 'master' of https://github.com/CuelogicTech/web-test
Merge branch 'master' into testing_branch
generating conflicts