fixed deploy
Merge branch 'master' of github.com:sosloow/china
ready for deploy?