new dictionary
Merge branch 'master' of https://github.com/divs/cs124project