added secure env variables
added facebook login
fix merge conflicts
fixed merge conflicts
fixed merge conflicts
fixed conflicts
Merge pull request #2 from laurenbenichou/master

Added user model and facebook login