changed cname
Merge branch 'master' of https://github.com/timbers/timbers.github.com
Made a basic merge, nothing special.