First working version of dictionary
Merge branch 'master' of github.com:aherriot/dictionary