got tableview to kind of work
got rid of prototype cells in tableview
Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'origin/master'
i hate git, storyboard compiler error