dependencies installed and working, view working, need to parse
controller returning json data
merge conflicts
merging with dv
redefining the c3 library
new c3 library
merged with dev
conflicts
avoiding timeseries for this release
merge
tryna jasmine
no one likes rspec
merge conflicts
merging
merging
Merge branch 'dev' into progress-chart
merge
Merge branch 'progress-chart' of https://github.com/zpfled/schoolio into progress-chart