Forgot to include makefile
merge
Merge branch 'master' of https://github.com/nearwood/carduino

Conflicts:
	carduino.geany