resolved gitignore conflict w ng-boilerplate - 2
resolved gitignore conflict w ng-boilerplate - 3