fixing merging
Merge branch 'master' of https://github.com/luis-rp/materialking.com.git