merging
Merge branch 'master' of https://github.com/sceptre12/Several_Projects_forBlkBox36950

Merging pushed shit
pushing
finally fixed the issue FINALLY for template 6