generated subscription model and controller
fixed merge conflicts
resolved merge conflicts
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
Begun landing page, cool scrolly thing done.