folder cleanup
overwriting user.rb
Reordering functions in graph js
Merge pull request #21 from gitnasty/master

Resolve merge conflicts
Adding header to application erb
Merge branch 'master' of github.com:cicadas-2014/percolator
Merge pull request #22 from kurokoda/master

Some general cleanup and css updates
commit before pull
Merge branch 'master' of https://github.com/cicadas-2014/percolator into homepage_login
change table column type for description from string to text
first problem test passes
adding styling to questions on homepage
Merge branch 'master' of github.com:cicadas-2014/percolator
Updated application js to avoid loading errors in js files
Adding path helpers for fonts
Merge pull request #23 from kurokoda/master

Attempting to fix JS errors
prepare for avgrund integration
change @object to object for error rendering partial
fix new problem form rendering
set up rails to include avgrund files when initializing