routing changes
Merge branch 'master' of https://github.com/sq1solutions/California-Psychics

Conflicts:
	index.html
	templates/sign-in.html