updated with weird merge issue
Merge branch 'master' of github.com:auremoser/VitalSigns-soil

Conflicts:
	README.md