can add new admins
fix merge
Merge branch 'master' of https://github.com/EmAndrews/myMood