Merge branch 'auth2' of https://github.com/michaelmunson1/caracol into auth2

Conflicts:
	server.js
Merge branch 'auth2' of https://github.com/michaelmunson1/caracol into auth2

Conflicts:
	server.js
Merge branch 'auth2' of https://github.com/michaelmunson1/caracol into auth2
implement auth foundation for user signin and login