resolved merge conflicts

system/Controllers/PageController.php

@@ -56,7 +56,7 @@ class PageController extends Controller
 					/* update sitemap */
 					$sitemap = new WriteSitemap();
 					$sitemap->updateSitemap('cache', 'sitemap.xml', 'lastSitemap.txt', $structure, $uri->getBaseUrl());
-					
+
 					/* check and update the typemill-version in the user settings */
 					$this->updateVersion($uri->getBaseUrl());					
 				}
@@ -192,5 +192,5 @@ class PageController extends Controller
 				}
 			}
 		}	
-	}
+	}	
 }

system/settings.php

@@ -36,7 +36,7 @@ class Settings
 			'settingsPath'							=> $rootPath . 'settings',
 			'authorPath'							=> __DIR__ . DIRECTORY_SEPARATOR . 'author' . DIRECTORY_SEPARATOR,
 			'contentFolder'							=> 'content',
-			'version'								=> '1.0.3'
+			'version'								=> '1.0.4'
 		];
 	}
 	

system/system.php

@@ -13,7 +13,7 @@ session_start();
 * LOAD SETTINGS			*
 ************************/
 
-$settings = Typemill\Settings::loadSettings();
+$settings = Typemill\settings::loadSettings();
 
 /************************
 * INITIATE SLIM 		*