New Makefile
Merge branch 'master' of https://github.com/mlaurijsse/Ecubee

Conflicts:
	fusion.cpp