Merge branch 'mh-getting-started-rearranging' of https://github.com/mxhold/docs into mxhold-mh-getting-started-rearranging

Conflicts:
	sites/en/intro-to-rails/getting_started.step

Author: tjgrathwell

sites/en/intro-to-rails/getting_started.step

@@ -25,28 +25,24 @@ steps do
   step do
     message "Check to see if you have any existing suggestotron apps from a previous workshop."
     console "ls"
-    message "That command will list the files in your railsbridge directory. If you have any old suggestotron apps in that list, you can remove them to prevent hiccups:"
+    message "`ls` stands for **l**i**s**t."
+    message "It lists the contents of the current directory."
+    message "If you have any old suggestotron apps in that list, you can remove them to prevent hiccups:"
     console "rm -rf suggestotron"
   end
 
   step do
     console "rails new suggestotron"
     message "`rails new` creates a new Rails project with the name you give."
     message "In this case we told it to create a new project called `suggestotron`. We'll go into detail on what it created shortly."
+    message "This will print a lot of stuff to the screen and can take a while to finish."
   end
 
   step do
     console "cd suggestotron"
-    message "'cd' stands for change directory."
     message "`cd suggestotron` makes suggestotron our current directory."
   end
 
-  step do
-    console "ls"
-    message "'ls' stands for 'list (stuff)'."
-    message "It shows you the contents of the current folder."
-  end
-
   step do
     message <<-MARKDOWN
 Open the suggestotron folder as a project in your text editor.