default_popup
home& signup
Merge branch 'master' of https://github.com/bzfisher/SwearJar

Conflicts:
	SwearJar_App/manifest.json
changes
Merge branch 'master' of https://github.com/bzfisher/SwearJar

Conflicts:
	SwearJar_App/manifest.json