fix merge confict, again

tangrams · May 10, 2017 · 7b598ac · 7b598ac
2 parents 9f46205 + 21923e8
commit 7b598ac
Show file tree

Hide file tree

Showing 7 changed files with 3,098 additions and 1,382 deletions.
diff --git a/README.md b/README.md
@@ -1,15 +1,13 @@
-# outdoor-style
-
-Work in progress!
+# walkabout-style
 
 ### To run locally:
 
 Start a web server in the repo's directory:
 
     python -m SimpleHTTPServer 8000
-    
+
 If that doesn't work, try:
 
     python -m http.server 8000
-    
+
 Then navigate to: [http://localhost:8000](http://localhost:8000)
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.0.0
+5.0.0
diff --git a/images/[email protected] b/images/[email protected]