Add Merge strategy for Facebook so far
Merge branch 'master' of github.com:sahat/hackathon-starter into merge-auth

* 'master' of github.com:sahat/hackathon-starter:
  Fixed typos and revisied custom html and css design section
  Add custom design 101 section to mini-guides
  Add html5up to Recommended Design links
Updated message if user with that email already exists
Update profile picture in Facebook strategy
Add Google and Github merge strategies
Add Twitter merging strategy
Update merging strategies
Instead of merging display flash messages notifying the user that account with another OAuth provider already exists.
Flash notifications for Facebook, Github, Twitter auth link
Update TODO
Update comments
Flash notification on OAuth Provider Unlink
Merge pull request #32 from sahat/merge-auth

Proper multi-auth linking