Merge pull request #38 from DMP-Capstone/margaretBranch

Margaret branch
Merge branch 'master' of github.com:DMP-Capstone/TableMaster into margaretBranch