Edits: .gitignore Adds: arduino-mode
Merge branch 'master' of https://github.com/edouardu/.emacs.d

Conflicts:
	.gitignore