Final commit in list-by-month branch
Merging list-by-month into master
Resolving conflicts caused by Dropbox
A bit more conflict resolution