Working dictionary code
Merge branch 'master' of github.com:rschlaikjer/hackathon2013