both tables being filled
fixed merge conflict
merged changes
Merge pull request #5 from xiamike/zach

Zach