Fixed title screen & help screen

2019-05-23 14:02:32 -04:00
parent ba18bed404 cf185c25aa
commit c5e73ec253
18 changed files with 141 additions and 3 deletions
--- a/data/words.dat
+++ b/data/words.dat
@@ -46,4 +46,12 @@ warm bread, item
 clothes, item
 sword, item
 blanket, item
-die, verb
+<<<<<<< HEAD
+die, verb
+=======
+butter, item
+novel, item
+mop, item
+bucket, item
+towels, item
+>>>>>>> branch 'master' of https://github.com/jslightham/Zork