Table class added
Merge remote-tracking branch 'origin/master' into garrett-branch
Merge remote-tracking branch 'origin/master' into garrett-branch
testing merge 1
Merge remote-tracking branch 'origin/master' into garrett-branch
testing merge 2
merge conflict resolved in table.cpp