updated admin forms
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4
heroku prep
Precompile assets
Revert "Precompile assets"

This reverts commit 3242336e15c6f708380e1fc2a4840734fd8d0994.
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4
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
about page is responsive
Merge pull request #37 from TIYA-Durham-GDI/accordion

Accordion
design tweaks on aside
merged to master
Bogus commit
Revert "Bogus commit"

This reverts commit d0c90dcd4c8356df5dfc4ffe3f661489eb945781.
Merge remote-tracking branch 'origin/master'
merge conflicts