merged for master
add .gitignore for el-get