Committing changes
Conflict resolved. Added UITableView support. Converted to storyboard