Merge pull request #50 from albertodotcom/master

Merge Luke changes
Merge pull request #53 from albertodotcom/master

Merge Lauren changes
Add users seed with our email adresses