Merge remote-tracking branch 'origin/master'

* origin/master: Initial commit
christopher-b · Jul 8, 2013 · c965e1b · c965e1b
2 parents 7e74614 + e3baa87
commit c965e1b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,4 @@
+canvas-vagrant
+==============
+
+A Vagrant + Puppet script for installing Canvas LMS