added function names and variables to symbol tables
added function names and params to hash tables
resolved merge conflicts
function names and parameters are now in symbol tables