redid trigrams
pass data from controller to js
Merge branch 'development' of https://github.com/seanbr/movie_dino into dojo
pie charts have data (hacky)
Merge pull request #22 from seanbr/dojo

real data
Merge branch 'development' into merging-errors