Added the Facebook link to the sign in page
Fixed merge conflict in devise/sessions/new.html.erb