this is the modified new featuere branch
this is a committed change
Merge branch 'master' of https://github.com/sbarnekow/WDI-DAY-1

Conflicts:
	c