Resolved issue with elements not adhering to inherited properties
Gitignore edit
Merge branch '20130703---After-a-long-time' of https://github.com/OpenInstitute/OpenDuka into 20130703---After-a-long-time

Conflicts:
	.gitignore
	application/views/header.php
	application/views/tree.php
	assets/css/docs.css
	assets/styles.css