installing theme
Merge branch 'master' into adding-theme