attempting to redirect to login page
Merge branch 'master' of https://github.com/salehkaddoura/oslplans

Conflicts:
	oslplans/app.js
Merge branch 'master' of https://github.com/salehkaddoura/oslplans

Conflicts:
	oslplans/app.js
Merge branch 'master' of https://github.com/salehkaddoura/oslplans

Conflicts:
	oslplans/app.js
	oslplans/routes/login.js
fixed home redirect
Merge branch 'master' of https://github.com/salehkaddoura/oslplans