Merge pull request #1 from cworkman123/master

Test pull
Merge pull request #2 from cworkman123/master

Rebuilt Model and Controller