Added heroku settings
Merge branch 'master' into heroku

* master:
  Make the derivatived header link
Added default ordering for models.
Merge branch 'master' into heroku

* master:
  Updated installation instructions for client
  Added find challenge by slug
Better managing static assets with new app.
Registration works!
Added default ordering for all models.
Merge branch 'registration'

* registration:
  Added default ordering for all models.
  Registration works!
  Better managing static assets with new app.
  Added default ordering for models.
Merge branch 'master' into heroku

* master:
  Added default ordering for all models.
  Registration works!
  Better managing static assets with new app.
  Added default ordering for models.
Added the registration link
Merge branch 'registration'

* registration:
  Added the registration link
Merge branch 'master' into heroku

* master:
  Added the registration link
Removed username/password from files
Merge branch 'master' into heroku

* master:
  Removed username/password from files
Need username/password for heroku
Updated requirements
Improved registration page aesthetic.
Changed button color on login_navbar
Added default email to send emails from.
Merge branch 'registration'

* registration:
  Added default email to send emails from.
  Changed button color on login_navbar
  Improved registration page aesthetic.