closes #26
Merge branch 'master' of github.com:stianjensen/wikipendium.no