Tableview added and labels edited
Merge remote-tracking branch 'origin/master'
Merge??