loading data for table views
table data
fixed merge conflicts and implemented table view cells with data
more merge conflicts
Merge branch 'master' of https://github.com/kathrynsiegel/concierge