add index view
Update views.py

change for merge
Update index.html

merge files
Merge branch 'master' into James1

Conflicts:
	mysite/mysite/templates/mysite/index.html
	mysite/mysite/views.py