consolidating tables
fixing merge conflicts
Merge pull request #9 from afalsario/afalsario

Afalsario