changed controller to match model
updated namespace
Merge pull request #3 from dwsla/qa

Qa - Master