base.html for home index
Merge branch 'master' of github.com:jay-lab/danjaysci

Conflicts:
	website_django/danjaysci/templates/base.html