my config
Update config
Merge branch 'master' of github.com:scottjgibson/Marlin-1

Conflicts:
	Configuration.h