generated subscription model and controller
fixed merge conflicts
resolved merge conflicts
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork
disabled ssl verification
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork
fixed merge conflicts
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork
Profile page now displaying count of user's status updates.
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork
Begun landing page, cool scrolly thing done.
Continued front end work.
refactored Activity and User models to facilitate better facebook queries
deleted obsolete  subscription code: model, views, controller etc
Merge branch 'master' into koala