fixed the merge table bugs
Merge branch 'master' of https://github.com/benchisa/BasicProgram