Radiator Assignment
Merge branch 'master' of https://github.com/asu-cis-capstone/skytouch

Conflicts:
README.md
Radiator Assignment
test
test