Added Dimensions component
Added Dimensions component; resolved merge conflicts
Merge pull request #1 from jleft/master

Add Dimensions component