README.md
merge conflict
added picture
added Omeka backup
changed background color to violet
changed font size to 24pt
added Neatline
conflicts