CREATED WORKING
I hate visual studio.
I REALLY HATE VISUAL STUDIO
I think I managed to climb out of visual studio hell.
Merge pull request #5 from mattcarlos/development

Development
Fixed Controller Merge Conflicts