Cleaned up to match style guidelines.
Merge branch 'master' of /home/tynach/Documents/Dry

Conflicts:
	Modules/numbers.php
	Templates/dimentions.php