fix changes to enclosure.rb-- uploadworker needs 2 arguments
Merge pull request #49 from schbetsy/thursday_demo_prep

fix changes to enclosure.rb-- uploadworker needs 2 arguments
reduce sidekiq concurrency to prevent postgres connection error
precompile assets for push to Heroku
Merge pull request #50 from schbetsy/heroku

precompile assets for push to Heroku
change format for sidekiq config initializer
changed text in about section
added favicon
Merge pull request #51 from schbetsy/thursday_demo_prep

Thursday demo prep
don't make multiple copies of files in dropbox
change name and slogan on front page
Merge pull request #52 from schbetsy/thursday_demo_prep

don't make multiple copies of files in dropbox
Merge pull request #53 from schbetsy/name_change

change name and slogan on front page
minor tweaks
changed Procfile for sidekiq configuration
Merge pull request #54 from schbetsy/heroku

changed Procfile for sidekiq configuration
Merge pull request #55 from schbetsy/favicon

Favicon
fix merge conflicts