WIP: creating daily contributions chart
-add chart to html, and to js tree
-start js file for chart creation
Merge branch 'master' of https://github.com/openoakland/opendisclosure

Conflicts:
	assets/js/app.js
parse data for creation of daily contributions chart
move sort function to its own method
add conditional in candidates.js to avoid "cannot read property attributes of undefined" error
WIP: displaying chart but missing x-axis
style daily contributions chart
remove duplicate declaration of var el in dailyContributions
remove comments and deglobalize some vars in dailyContributionsChart.js
adjust daily contributions to only append each axis once
axes are no longer cropped in daily contributions
Merge branch 'master' of https://github.com/openoakland/opendisclosure

Conflicts:
	assets/js/app.js
specify css on dailyContributions, add candidateColors object to dailyContributions
dailyContributions changes
-add some bottom margin
-add colors to lines
-add drawLegend function
Merge branch 'master' of https://github.com/openoakland/opendisclosure

Conflicts:
	assets/js/views/candidate.js
Merge branch 'master' of https://github.com/openoakland/opendisclosure
stick zip-leader-chart back in
Fix reload of candidates
Merge pull request #110 from mikeubell/About

Fix reload of candidates
fix merge conflicts from upstream