.
.
.
.
removed file that shouldn't be tracked
removed file that shouldn't be tracked
untrack
lots of changes. including log-in
Merge remote-tracking branch 'origin/Bibo-Dev' into Bibo-Dev
Merge remote-tracking branch 'origin/Geman-Dev' into Geman-Dev
Merge branch 'Geman-Dev' into Bibo-Dev
Facebook login
merge from geman-dev
Merge remote-tracking branch 'origin/Geman-Dev' into Geman-Dev
Merge branch 'Geman-Dev' into Bibo-Dev
Facebook request
Before merge
Merge remote-tracking branch 'origin/Geman-Dev' into Geman-Dev
print results
Merge branch 'Geman-Dev' into Bibo-Dev