New version with rubric
Merge branch 'master' of github.com:4tapsdev/4tapsdev.github.io