Convert file encodings to UTF-8
Use standard format for field
Merge branch 'master' of github.com:akuchling/book-diary