update
update
update
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
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
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
	models/Auth/sessionDb.js

separate page auth and api auth