Minor change to payments
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
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
Minor change
Modify user controller to include seperate unsubscribe action
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork