Arduino!
Merge branch 'master' of https://github.com/jhottenstein/HomeDir

Conflicts:
	.bashrc