Added a public domain image for testing purposes.
Fixed merge conflicts.