import passport.
ide workspace files..
Merge branch 'master' of https://github.com/HackerNewsNight/playground_angular

Conflicts:
	app/BeerDetails.html
	app/css/app.css
	app/js/app.js
	app/js/controllers/BeerController.js
	app/js/filters.js
	scripts/web-server.js
	server.sh