WIP need to modify User model for OAuth login
begin bootstrap styling
merge conflict
begin bootstrap styling
update Gemfile
Finished Facebook OAuth login
fix conflicts