judy's first commit
initial program
Merge branch 'master' of github.com:judymou/solardandroidapp
Added buttons
Added net zero in README
made progress on app
Merge branch 'master' of github.com:judymou/solardandroidapp
I didn't make any change, but something is modified.
Add blindsActivity and thermostatActivity. Changed icon pictures.
Merge branch 'master' of https://github.com/judymou/solardandroidapp

Conflicts:
	src/com/caltech/edu/dalehouseapp/MainActivity.java
Add blinds, thermostat, and energy display.
Add blinds, thermostat, and energy display.
bin and gen folders removed
Initial commit
"abc"
Merge branch 'master' of github.com:lahn0528/solarandroidapp