Adding merge file
Merge branches 'master' and 'feature-branch-merge'
Adding assignment images