alright
sign_in is revised
conflict is fixed
facebook log_in is complete
Merge pull request #28 from matcho3/facebook

Facebook