dictionary
Merge branch 'master' of https://github.com/DavidSalzer/Rising-Star-app