updated index.html with new login page
changed file system
Merge branch 'colin' of github.com:tmccoy/sad

Conflicts:
	wsgi.pyc