Unit Tests
Added Junit testing project, and changed ControllerApp
Merge branch 'unitTestBranch' of https://github.com/KarlParkinson/301project into unitTestBranch