alphabetized license.txt entries so it is easy to see that everything is accounted for, see #5
Merge remote-tracking branch 'origin/master'