Fix conflicts with recent commits (I think/hope)

Some commits this week caused some conflicts with some open pull
requests made last week. I believe and hope that I fixed the conflicts.

1987/README.md

@@ -0,0 +1,29 @@
+1987 marked the "The Fourth International Obfuscated C Code Contest"
+
+
+Look at the README.md file for the given winner for information
+on how to compile the winner and how to run the winning program.
+Look at the winning source and try to figure how it does what it does!
+You may then wish to look at the Author's comments for even more details.
+
+The rules for 1987 suggested even more categories than in 1986.  Hints
+for what to do and not to do were also given in the rules.  For
+example, a simple excessive abuse of /lib/cpp was discouraged unless
+the abuse was unusual.  The mailboxes for the contest were moved from
+nsc to amdahl.  The practice of posting a preliminary set of rules for
+the next year was started this year.
+
+Rules and results were posted to comp.lang.c, comp.unix.wizards with
+an announcement in news.announce.important.  Micro/Systems Journal
+published the 1987 winners.  Mark Horton included a version of the 1987
+winners in an appendix of his C book.  The first announcement of
+winners at the Summer 87 Usenix was helped by a small fly that
+danced all over the foils.
+
+=-=
+
+Copyright (c) 1987, Landon Curt Noll & Larry Bassel.
+All Rights Reserved.  Permission for personal, educational or non-profit use is
+granted provided this this copyright and notice are included in its entirety
+and remains unaltered.  All other uses must receive prior permission in writing
+from both Landon Curt Noll and Larry Bassel.