Fixed merge conflict.
Merge branch 'build' of github.com:inkycoder/hs-deck-site into build
- Added visual representation of FB login.