added facebook login
Merge branch 'master' of https://github.com/fschargorosdky/simple_pogo

Conflicts:
	app/views/layouts/application.html.erb