From d54da1ea2b315a2ada023d189c31571949d25d06 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Fri, 6 Nov 2015 08:50:30 -0500
Subject: [PATCH] merge

---
 Changelog | 3 +++
 main.cpp  | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index 62dbbb9..b286376 100644
--- a/Changelog
+++ b/Changelog
@@ -254,3 +254,6 @@
 ==========
 
 	- worlds can now be saved & loaded from a file
+	- created 'storyboard' for first few player areas
+	- improved flashlight
+	- made some minor improvements to world appearance
diff --git a/main.cpp b/main.cpp
index b3e94c4..c68b342 100644
--- a/main.cpp
+++ b/main.cpp
@@ -491,7 +491,6 @@ int main(int argc, char *argv[]){
     char *worldBuf;
     unsigned int worldSize;
     worldBuf=currentWorld->save(&worldSize);
-    if(ferror(worldSave))perror("HEY: ");
     fclose(worldSave);
     
     return 0;	// Calls everything passed to atexit
-- 
2.39.5