Precompile assets
Revert "Precompile assets"

This reverts commit 3242336e15c6f708380e1fc2a4840734fd8d0994.
try to force asset recompile
try to force asset recompile again
Recompile 3
Recompile 4
Revert "Recompile 4"

This reverts commit a1a567a921104b5fc2ab3a27443128da1e9cd10d.
Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4
Bogus commit
Revert "Bogus commit"

This reverts commit d0c90dcd4c8356df5dfc4ffe3f661489eb945781.
accordion finally functional
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4
Convert assets to scss

Trying to trigger asset precompilation.
Assets, round 2
Revert "Assets, round 2"

This reverts commit 543aaf1640b1cb91574a28eeb0fbda0d5e91c34a.
Add assets to assets.rb
Merge branch 'accordion' of https://github.com/TIYA-Durham-GDI/GDI-rails-4 into accordion
Merge branch 'master' into accordion

Conflicts:
	app/assets/stylesheets/modules.css.scss
	app/assets/stylesheets/state.css.scss
Merge pull request #38 from TIYA-Durham-GDI/master

Hey hey, it's the accordion!