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.

1989/README.md

@@ -0,0 +1,37 @@
+1989 marked the "The Sixth 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.
+
+Instructions for use: Run make to compile entries (it is possible
+that on System V or non-unix systems the makefile needs to be
+changed).
+
+This year, the Grand Prize was given to the most useful program.
+
+The "Strangest abuse of the rules" award was given this year to stress
+the fact that starting in 1990, compiling entries must result an
+executable regular file.
+
+The makefile always uses the portable version of the "Best
+self modifying program" because there as no loss of functionality in
+using it.  In the case of the "Best game" winner, however, some
+functionality is lost in the portable version and so the makefile uses
+the original program.  System V users may need to change the makefile
+to use the s5 version.  See the hint files or the Makefile for details.
+
+Rules and results were posted to comp.lang.c, comp.sources.unix, and
+alt.sources.  They have been made available on a wide number of Usenet
+archive sites such as uunet.  The 1989 winners will be published in the
+Micro/Systems Journal.
+
+=-=
+
+Copyright (c) 1989, 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.