Pushing the dean-home.html up
Merge branch 'develop' of https://github.com/thortek/dgm4790-spring2014 into develop

Conflicts:
	www/templates/dean-home.html