Getting LoginActivity ready
fixed merge conflicts, added facebook module
added gitignore