from matrix to dictionary
Merge branch 'master' of github.com:povauboin/hashcode