Merge pull request #1 from JesseScott/master

Pulling table view fix from Jesse
misc changes
Small fix to allow to run
Two table views working with separate data
three working columns for cardio, balance & strength
images merged into balance cells
feixed conflicts from bob
,,,
feixed conflicts from bob