githubschool/example-basic — pull request #35 by githubteacher (2014-09-26 22:56:42+00:00)
Title: merging develop into staging

cc @githubschool/opsqa