dept changes
Merge branch 'vic-branch'

Conflicts:
	css/framework.css