FInished everything related to subscription
Merge branch 'master' of github.com:betoesquivel/AMSSProject