working on timseries
Merge branch 'master' of https://github.com/Ruby-GovHack/visualiser

Conflicts:
	code/app/scripts/directives/timeseries.js