set up table view controller
fixed merge conflicts