t push origin maste::x :x Merge branch 'master' of https://github.com/ferreiro/Basic-Website-Template
t push origin maste::x
:x
Merge branch 'master' of https://github.com/ferreiro/Basic-Website-Template

ferreiro/Basic-Website-Template,ferreiro/Basic-Template,ferreiro/Basic-Website-Template,ferreiro/Basic-Template