user instance can get statuses from facebook
merge conflict resolved
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork
fixed rendering bug in Activities controller