Changed the header with mata tags,so
fixed conflicts, so
Merge branch 'master' of https://github.com/DietCokeFiend/kidsBlog