Cancel notification
Revert my shitty fix
Merge branch 'master' of github.com:tatocaster/friendzone-client