implemented dual controllers
finished project
added styling
merge conflicts
resolved after merge conflicts
Merge pull request #1 from drabinowitz/controllerRefactor

Controller refactor