switch and to or
Merge branch 'master' of https://github.com/bzfisher/SwearJar

Conflicts:
	SwearJar_App/signup.html
	SwearJar_App/success.html