modified:   app/index.html
	modified:   app/js/directives.js
	modified:   app/views/home/homeCtrl.js
	modified:   app/views/home/homeView.html
Merge branch 'master' of https://github.com/adamhurst/angular-d3-seed

Conflicts:
	app/js/directives.js
	app/views/home/homeCtrl.js
	app/views/home/homeView.html

	modified:   app/css/app.css
	new file:   app/data/Articles.html
	new file:   app/data/Summary.json
	new file:   app/data/articleProcessing.js
	new file:   app/data/links.json
	new file:   app/data/markers.json
	modified:   app/index.html
	new file:   app/js/barChart.js
	modified:   app/js/directives.js
	modified:   app/views/home/homeCtrl.js
	modified:   app/views/home/homeView.html
	modified:   app/views/view2/view2.html
	modified:   app/views/view2/view2.js
	modified:   bower.json
	modified:   .bowerrc
	modified:   app/app.js
	modified:   app/css/app.css
	modified:   app/d3_resources/cubehelix.js
	new file:   app/data/mapdata.json
	modified:   app/index.html
	modified:   app/js/directives.js
	modified:   app/js/services.js