Removed .DS_Store files
Merge branch 'master' of github.com:berkley/arduino

Conflicts:
	.DS_Store
	.gitignore