fixed some stuff

.
Merge branch 'master' of github.com:142FinalProject/Content_Blog