merged with master
Merge branch 'gh-pages' of https://github.com/zhukov/webogram into gh-pages