textual changes to test the branch
Merge branch 'master' into testing_branch
generating conflicts
comitting the changes
Merge branch 'master' of https://github.com/CuelogicTech/web-test
Notepad file for git commands
Merge branch 'master' of https://github.com/CuelogicTech/web-test into testing_branch
removing file
removing backup file of edit plus
Adding the Symfony Documentation file
Merge branch 'testing_branch'