commit before pull
Merge branch 'master' of https://github.com/cicadas-2014/percolator into improvements
Adding dummy data to seed data
Merge branch 'master' of github.com:cicadas-2014/percolator
Adding additional questions to dummy data
Merge pull request #56 from kurokoda/master

Updated data to more accurately reflect real world use
Merge branch 'master' of https://github.com/cicadas-2014/percolator into improvements
Fixing broken javascript for chart animation. Please test your changes, folks.
Merge pull request #57 from kurokoda/master

Fixing broken javascript for chart animation. Please test your changes, ...
fixed disqus and merge conflicts
Merge pull request #58 from mcclungt/improvements

fixed disqus and whatnot
add oojs skeleton
git with it