changed images
small change in character
Fixed merge conflicts
Merge branch 'TwoSeconds-lund3481_issue_10'