Some changes
Merge branch 'master' of https://github.com/ventsi34/extra-ordinary-template