pref preventing merge.  Committing to enable merge.
Merge branch 'master' of github.com:MCUpdater/MCU-DownloadLib

Conflicts:
	.settings/org.eclipse.jdt.core.prefs