pyc should be in gitignore
Merge branch 'master' of https://github.com/webdesigndecal/website

Conflicts:
	WDWorkshop/WDsite/Attendance/admin.pyc
	WDWorkshop/WDsite/Attendance/models.pyc
	WDWorkshop/WDsite/WDsite/settings.pyc
	WDWorkshop/WDsite/WDsite/views.pyc
	WDWorkshop/WDsite/userprofile/__init__.pyc
	WDWorkshop/WDsite/userprofile/admin.pyc
	WDWorkshop/WDsite/userprofile/models.pyc