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.

1984/README.md

@@ -0,0 +1,20 @@
+In 1984, the first contest was held.  The name of the contest was simply
+``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.
+
+Restrictions against machine dependent code were not in the rules in 1984.
+The source file size restriction was only 512 bytes.  Rules and results
+were posted to net.lang.c and net.unix-wizards.
+
+=-=
+
+Copyright (c) 1984, Landon Curt Noll.
+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.