adding everything
Merge pull request #12 from MiguelABarbosa/miguel

adding everything
fixing facebook login
Merge pull request #13 from MiguelABarbosa/miguel

fixing facebook login
merge conf
merge try
cool it works