Renamed ViewController to MainViewController. Changed references to it.
Renamed ViewController to MainViewController. Changed references to it.
Merge remote-tracking branch 'origin/workingbranch'