add ability to disply Fahrenheit or Celsius, with form
Merge branch 'dev' into gh-pages

* dev:
  add ability to disply Fahrenheit or Celsius, with form