remove merge conflict
get facebook profile picture added
add logout button
refactor login js
Merge pull request #17 from JoshSGman/master

refactor code