Overrode old viewcontroler
Merge remote-tracking branch 'UCIrvine/master'