change some api path
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app.js
	models/Auth/account.js
	routes/index.js
change some api path
change some api path
Merge branch 'master' of https://github.com/ryanivanka/YummyDev

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/ryanivanka/YummyDev

Conflicts:
	.idea/workspace.xml