Changes to the branch
Merged maser fixed conflict
Merge branch 'master' of https://github.com/CuelogicTech/web-test into testing_branch
Adding JS file , for working HTML 5 on IE
adding file
Merge branch 'master' of https://github.com/CuelogicTech/web-test
Merge branch 'master' of https://github.com/CuelogicTech/web-test
Merge branch 'master' of https://github.com/CuelogicTech/web-test
textual change
design branch
Merge branch 'testing_branch'
Merge branch 'master' of https://github.com/CuelogicTech/web-test
changed done in the core text
Merge branch 'master' of https://github.com/CuelogicTech/web-test
Merge branch 'master' of https://github.com/CuelogicTech/web-test into demoBranch
generating confilcts