Controller / Viewer skeletons
Merge branch 'master' of https://github.com/masidonion/jokr