Merge pull request #31 from DMP-Capstone/denali

Denali
Merge branch 'master' of github.com:DMP-Capstone/TableMaster into denali

# Via Margaret
* 'master' of github.com:DMP-Capstone/TableMaster: