additions
Merge github.com:pinesol/intro-ds-hai
mergeHAITables_Proxy now gives us the proxy column we want