replace
Merge branch 'master' of https://github.com/speark/sns_login

Conflicts:
	app.js