aadded placeholder for Thazin
Merge branch 'master' of https://github.com/josephbaena/kimball-website-2014