Resolve merge conflict by modifying README file

Author: lukeblevins

README.md

@@ -1,9 +1,4 @@
 <h1>Files UWP</h1>
-<<<<<<< HEAD
-<h4>Welcome!</h4>
-<p>All new work is currently being done on the newui branch, so the designs in this branch are completely outdated. Expect these to go away soon.</p>
-=======
 <p>Meet Files, an enthusiast take on what Windows File Explorer explorer <b>should</b> be.</p>
 <img src="Files UWP/Assets/FilesHome.png" width="600px">
 <img src="Files UWP/Assets/FilesDrive.png" width="600px">
->>>>>>> newui