added .idea in gitignore
Merge branch 'master' of https://github.com/emchooo/LaravelAngularJS