Switched from basic auth to basic + cookie auth
Merge branch 'master' of github.com:realchaseadams/puppypals

Conflicts:
	.sass-cache/d528bb25f143c528d38752764828a77610166dfb/main.sassc
	app/routes.js