Added users model, form, and first commit
fixed facebook code
Fixed gitignore merge conflicts