add an AUTHORS file
Merge remote-tracking branch 'upstream/master' into typo
I must obey my master