diff --git a/humbug/urls.py b/humbug/urls.py
index ff389461b3..29abea31c5 100644
--- a/humbug/urls.py
+++ b/humbug/urls.py
@@ -36,6 +36,9 @@ urlpatterns = patterns('',
url(r'^terms$', 'django.views.generic.simple.direct_to_template', {'template': 'zephyr/terms.html'}),
url(r'^privacy$', 'django.views.generic.simple.direct_to_template', {'template': 'zephyr/privacy.html'}),
+ # New user "tutorial"
+ url(r'^new-user$', 'django.views.generic.simple.direct_to_template', {'template': 'zephyr/new-user.html'}),
+
# These are json format views used by the web client. They require a logged in browser.
url(r'^json/update_pointer$', 'zephyr.views.json_update_pointer'),
url(r'^json/get_updates$', 'zephyr.views.json_get_updates'),
diff --git a/templates/zephyr/new-user.html b/templates/zephyr/new-user.html
new file mode 100644
index 0000000000..f906d5f942
--- /dev/null
+++ b/templates/zephyr/new-user.html
@@ -0,0 +1,49 @@
+{% extends "zephyr/portico.html" %}
+
+{# New user tutorial standin. #}
+
+{% block portico_content %}
+
+
+
Hello, and welcome!
+
+
Humbug is a little different than some systems you may have already
+ used.
+ Here's what you need to know:
+
+
+ - Every message has a stream and a subject
+ - A stream is kind of like a mailing list -- it represents a group of people -- and anyone can subscribe to a stream and start getting traffic there
+ - A subject, on the other hand, is what the message is actually about
+ - (You can, of course, send private messages.)
+ - All of these are displayed simultaneously, in an interleaved way, chronologically
+ - Time flows down, and the page does not automatically scroll
+
+
+
This means we can have a conversation about git, jQuery,
+ fundraising, where to go to lunch, and a message from your commit bot
+ all simultaneously--without it getting unmanageable.
+
+
Let's take a look:
+
+
+
+
Here, we have three conversations occurring simultaneously:
+
+ - One on stream "humbug" with subject "Lunch", about where to go to lunch
+ - One on stream "humbug" with subject "Humbug testers", about early beta testers
+ - One automated notification on stream "commits", about a commit made to the repository
+
+
+
Some things to know
+
+ - "Enter" will start a reply to the message with the blue line by it (in the example above, the one with subject "Humbug testers")
+ - When you send the reply, it will appear at the very bottom of the stream (not directly below the message you reply to)
+ - After you're done typing a reply, you can send it with Tab followed by Enter (just pressing Enter will add a new line to the message)
+
+
+
That's it!
+
Create your account now
+
+
+{% endblock %}
diff --git a/zephyr/static-access-control/public/images/streams-example.png b/zephyr/static-access-control/public/images/streams-example.png
new file mode 100644
index 0000000000..c0a5394b3d
Binary files /dev/null and b/zephyr/static-access-control/public/images/streams-example.png differ