bumping version to force upgrade
Merge branch 'master' of https://github.com/tekbasse/q-wiki
merging to keep updates pushed from other machines
bumping version to force package upgrade