reformatted tables
resolved merge conflict
changed double quotes to single quotes in map formatting
resolved merge issues
Merge pull request #24 from LizaHCarter/table-formatting

Table formatting