small changes
Create climate_controls.html
Create radio.html
Create diagnostics.html
asdfasdf

asdf
some sample data
resovle merge conflict
resolve more merge conflict
Merge branch 'master' into Leora

Conflicts:
	app/js/controllers.js
index page work