hacking without posting injectin db
Merge branch 'master' of https://github.com/tsai0606/find-friend

Conflicts:
	app.js