fixing bug
fixed a bug
removed .gitignore
Merge branch 'yuex-dev' into develop
gitignore updated