gitignore
fix .gitignore conflict
Merge branch 'master' of https://github.com/qujian/erlang
add erlang-mbcs