Andrew week 6
Merge branch 'master' of https://github.com/zoq/blog