Updated with NUnit
Merge branch 'master' into Regan
Added controller and view classes with switch and menu statements.