Promotional website complete - navitem functional

Script.js pretty much rewritten to implement a fully functional navbar.
Merge branch 'master' of https://github.com/webdesigndecal/website

Conflicts:
	WDWorkshop/WDsite/WDsite/__init__.pyc
	WDWorkshop/WDsite/WDsite/settings.pyc
	WDWorkshop/WDsite/WDsite/urls.pyc
	WDWorkshop/WDsite/WDsite/views.pyc
	WDWorkshop/WDsite/WDsite/wsgi.pyc
	WDWorkshop/WDsite/templates/index.html
	WDWorkshop/WDsite/userprofile/__init__.pyc
	WDWorkshop/WDsite/userprofile/admin.pyc
	WDWorkshop/WDsite/userprofile/models.pyc