Merge pull request #7 from penguinscontrol/master

sync for finished stopwatch
Merge pull request #8 from penguinscontrol/master

Finished stopwatch
Merge pull request #9 from penguinscontrol/master

minor sync
temp control
Merge pull request #10 from penguinscontrol/master

Stopwatch Stuff
Merge pull request #11 from dpiao92/master

Temp Controller
Merge pull request #3 from frankguolee/master

Sync