Adding in new containers, rows, and columns
Fixed issue with bad merge
Merge pull request #129 from noahbass/fix/containers-rows-and-columns

Adding in new containers, rows, and columns