New file crazy.jpg
Merge branch 'crazy' into old_branch
Merge branch 'old_branch'