modified gitignore per larry's comment
Merge branch 'hao' into stage
vender.js updated