Rebuilt Model and Controller
Merge pull request #2 from cworkman123/master

Rebuilt Model and Controller