deleted extra folder
Merge branch 'master' of https://github.com/chupacabracito/Virgin_Repository

Conflicts:
	ipd-ui/thermostat_merge/radiant/merged_radiant/merged_radiant.ino
	ipd-ui/thermostat_merge/server.js