commented out 404 in index to remove warning
Merge branch 'master' of https://github.com/brownsusan/ssl_notflickr

Conflicts:
	index.php
Merge branch 'master' of https://github.com/brownsusan/ssl_notflickr
fixed login stuff
Merge branch 'master' of https://github.com/brownsusan/ssl_notflickr