Made some changes to files
Merge branch 'master' of github.com:cecc/new_site