Delete bower.json
Fixed merge conflict issues
now ignoring node_modules, not nod_models
Merge branch 'master' of github.com:ablease/github-report-angular

Conflicts:
	bower.json
fixing merge errors