Made changes to controller
Changed the same line as in another branch
Changes to the about page
Merge branch 'test-branch-one'
Resolved merge conflict