width
row-fluid adjustments
Merge branch 'julia' into testing

Conflicts:
	documents/css/company.css