Reorganized the style guidelines a bit.
Merge branch 'master' of /home/tynach/Documents/Dry

Conflicts:
	Templates/dimentions.php