Merge branch 'master' of github.com:wanyizhu/beeproject2013 into gh-pages
Merge branch 'gh-pages' of github.com:wanyizhu/beeproject2013