dealing with merge errors for bower setup
updated file structure
added app.js file
updated index file to include app.js and fixed errors
Fixed merge conflict issues
now ignoring node_modules, not nod_models
Merge branch 'master' of github.com:ablease/github-report-angular

Conflicts:
	bower.json