ignoring bower components like angular
resolved gitignore conflict