4.9
Merge branch 'master' of https://github.com/Smitter/GRBL_LM4F120H5QR

Conflicts:
	settings.c