routing changed
user can be authenticated via facebook
Added placeholder image, overrides css and started working on the home page.
Sorted merge conflict on application page.
session controller specs complete
Merge branch 'master' into user
User model specs added
Further styling to the homepage.
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork
Removed minified bootstrap css.
Added FB token to the user model
Merge branch 'master' into user
Fix conflict
Fix conflict