First attempt at MVC
MVC functional
Merge remote-tracking branch 'origin/MVC'