new blog
Merge branch 'master' of github.com:baham/baham.github.com

The local is newer