committed
committed
Removed ViewController
fixed merge problem