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.

1985/README.md

@@ -0,0 +1,21 @@
+1985 marked the second year of the 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.
+
+Hints against machine dependent code were added to the rules to avoid
+another 1984 style winner.  Rules and results were posted to net.lang.c
+and net.unix-wizards.  Larry Bassel was invited to help in the
+judging.  Awards were given to 5 classes of programs since we were
+unable to select only the best 4.
+
+=-=
+
+Copyright (c) 1985, 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.