Updated with navigation controllers - need to figure out how to access textfield and add back button (tableview delegate needs to be set up I think)
Merge remote-tracking branch 'origin/master'