Most recent changes

Final commit before generating a Users Controller