Added twig template and fixed namespace
Merge branch 'master' of github.com:QasAshraf/bearded-octo-ninja