Update of events
remove polls
add contact
Merge branch 'master' into James1

Conflicts:
	mysite/mysite/templates/mysite/index.html
	mysite/mysite/views.py
Merge pull request #1 from cs98jrb/James1

James1