Rubyfuza/aws-workshop — pull request #5 by marcbowes (2013-02-08 14:26:01+00:00)
Title: Merge in Ronen's user model

This merges feature-email into master, handling the routing conflict.